mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deb: Don't Conflicts/Replaces with a 10.9 provided by the same package

Browse source 
Fixes issues like e.g.:

  The following packages have unmet dependencies:
   mariadb-client : Breaks: mariadb-client-core-10.9
                    Breaks: mariadb-server-10.9
   mariadb-server-core : Breaks: mariadb-client-10.9
                         Breaks: mariadb-server-10.9

and

  [ERROR] Missing Breaks/Replaces found
  [ERROR] libmariadb-dev-compat conflicts with libmariadbclient-dev
        files: {'/usr/bin/mysql_config'}
This commit is contained in:
Otto Kekäläinen 2022-04-30 23:14:19 -07:00 committed by Daniel Black
parent ff1d8fa7b0
commit dde5988306
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
debian/control vendored
View file

@ -94,6 +94,7 @@ Depends: libmariadb-dev (= ${binary:Version}),
${misc:Depends}
Conflicts: libmariadb-client-lgpl-dev,
libmariadb-client-lgpl-dev-compat,
libmariadbclient-dev (<< ${source:Version}),
libmariadbclient-dev-compat,
libmysqlclient-dev,
libmysqlclient10-dev,
@ -108,6 +109,7 @@ Breaks: libmariadb-dev (<< ${source:Version})
Replaces: libmariadb-client-lgpl-dev,
libmariadb-client-lgpl-dev-compat,
libmariadb-dev (<< ${source:Version}),
libmariadbclient-dev (<< ${source:Version}),
libmariadbclient-dev-compat,
libmysqlclient-dev
Description: MariaDB Connector/C, compatibility symlinks
@ -335,7 +337,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client-10.9 (<< ${source:Version}),
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
@ -365,7 +367,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core-10.9,
mariadb-server-core-10.9 (<< ${source:Version}),
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
@ -413,7 +415,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client-10.9 (<< ${source:Version}),
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
@ -443,7 +445,7 @@ Breaks: mariadb-client-core (<< ${source:Version}),
mariadb-client-core-10.6,
mariadb-client-core-10.7,
mariadb-client-core-10.8,
mariadb-client-core-10.9,
mariadb-client-core-10.9 (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
@ -454,7 +456,7 @@ Breaks: mariadb-client-core (<< ${source:Version}),
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server-10.9 (<< ${source:Version}),
mariadb-server-core (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
@ -486,7 +488,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client-10.9 (<< ${source:Version}),
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
@ -501,7 +503,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-core-10.6,
mariadb-client-core-10.7,
mariadb-client-core-10.8,
mariadb-client-core-10.9,
mariadb-client-core-10.9 (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
@ -512,7 +514,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server-10.9 (<< ${source:Version}),
mariadb-server-core (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
@ -523,7 +525,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core-10.9,
mariadb-server-core-10.9 (<< ${source:Version}),
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
@ -579,7 +581,7 @@ Conflicts: mariadb-server-core-10.0,
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core-10.9,
mariadb-server-core-10.9 (<< ${source:Version}),
mariadb-server-core-5.1,
mariadb-server-core-5.2,
mariadb-server-core-5.3,
@ -602,7 +604,7 @@ Breaks: mariadb-client (<< ${source:Version}),
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client-10.9 (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
@ -612,7 +614,7 @@ Breaks: mariadb-client (<< ${source:Version}),
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server-10.9 (<< ${source:Version}),
mysql-client-5.5,
mysql-server-5.5,
mysql-server-5.6,
@ -631,7 +633,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client-10.9 (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
@ -641,7 +643,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server-10.9 (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
@ -716,7 +718,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server-10.9 (<< ${source:Version}),
mariadb-server-5.1,
mariadb-server-5.2,
mariadb-server-5.3,
@ -751,7 +753,7 @@ Replaces: handlersocket-mysql-5.5,
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client-10.9 (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
@ -762,7 +764,7 @@ Replaces: handlersocket-mysql-5.5,
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server-10.9 (<< ${source:Version}),
mariadb-server-5.1,
mariadb-server-5.2,
mariadb-server-5.3,

17
debian/source/lintian-overrides vendored
View file

@ -14,6 +14,23 @@ version-substvar-for-external-package mariadb-client -> mysql-client-core-5.6
version-substvar-for-external-package mariadb-client -> mysql-client-core-5.7
version-substvar-for-external-package mariadb-client -> mysql-client-core-8.0
version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
# Intentional version-substvar-for-external-package as long as mariadb-server
# provides mariadb-server-10.9 and mariadb-client provides mariadb-client-10.9
version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.9
version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.9
version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.9
version-substvar-for-external-package Conflicts (line 95) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
version-substvar-for-external-package Replaces (line 109) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.9
version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.9
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.9
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.9
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.9
version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.9
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.9
version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.9
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.9
version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.9
# ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
# Must be fixed upstream