diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2020-04-07 20:17:54 +0300 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <vicentiu@mariadb.org> | 2020-04-19 17:15:40 +0300 |
| commit | 9ed7e967b3fe58a0b28e5c21ef3f41042e96b53a (patch) | |
| tree | c53c9f6b71f37ef6098ca0625acea32a8acb8c2c /debian/control | |
| parent | 7a0eeaaf665c2ddad9ba86782b3c4ab1b7eb3cc2 (diff) | |
| download | mariadb-git-9ed7e967b3fe58a0b28e5c21ef3f41042e96b53a.tar.gz | |
MDEV-6284: Sync breaks/replaces relationships and file locations
These changes are in line with what has been changes in downstream Debian
and they fix the following errors:
$ check_for_missing_breaks_replaces.py -o ${WORKING_DIR}/missing_breaks.xml --changes-file ${WORKING_DIR}/*.changes
[ERROR] mariadb-client-10.5 conflicts with mytop files: {'/usr/bin/mytop'}
[ERROR] mariadb-client-10.5 conflicts with mariadb-client-core-10.3 files: {'/usr/bin/mysqlcheck'}
[ERROR] mariadb-server-10.5 conflicts with mariadb-server-core-10.3 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/bin/resolveip', '/usr/share/mysql/mysql_test_data_timezone.sql'}
[ERROR] mariadb-client-10.5 conflicts with mysql-client-core-5.7 files: {'/usr/bin/mysqlcheck'} [ERROR] mariadb-server-10.5 conflicts with mariadb-server-core-10.3 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/bin/resolveip', '/usr/share/mysql/mysql_test_data_timezone.sql'}
[ERROR] mariadb-server-10.5 conflicts with mysql-client-5.7 files: {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'}
[ERROR] mariadb-server-core-10.5 conflicts with mysql-server-5.7 files: {'/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/bin/resolveip', '/usr/share/man/man1/resolveip.1.gz'}
[ERROR] mariadb-test conflicts with mysql-server-5.7 files: {'/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/mypluglib.so'}
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/debian/control b/debian/control index d90055f8900..e91879b31d5 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> Build-Depends: bison, chrpath, - debhelper (>= 9), cmake, + debhelper (>= 9), dh-apparmor, dh-exec, dh-systemd, @@ -347,7 +347,20 @@ Conflicts: mariadb-client (<< ${source:Version}), mysql-client-5.6, mysql-client-5.7, mysql-client-8.0, + mysql-client-core-5.0, + mysql-client-core-5.1 (<< ${source:Version}), + mysql-client-core-5.5 (<< ${source:Version}), + mysql-client-core-5.6 (<< ${source:Version}), + mysql-client-core-5.7 (<< ${source:Version}), + mysql-client-core-8.0 (<< ${source:Version}), + mytop, virtual-mysql-client +Breaks: mariadb-client-core-10.0, + mariadb-client-core-10.1, + mariadb-client-core-10.2, + mariadb-client-core-10.3, + mariadb-client-core-10.4, + mariadb-client-core-10.5 (<< ${source:Version}) Replaces: mariadb-client (<< ${source:Version}), mariadb-client-10.0, mariadb-client-10.1, @@ -359,6 +372,12 @@ Replaces: mariadb-client (<< ${source:Version}), mariadb-client-5.2, mariadb-client-5.3, mariadb-client-5.5, + mariadb-client-core-10.0, + mariadb-client-core-10.1, + mariadb-client-core-10.2, + mariadb-client-core-10.3, + mariadb-client-core-10.4, + mariadb-client-core-10.5 (<< ${source:Version}), mariadb-server-10.5 (<< ${source:Version}), mysql-client (<< 5.0.51), mysql-client-5.0, @@ -367,6 +386,13 @@ Replaces: mariadb-client (<< ${source:Version}), mysql-client-5.6, mysql-client-5.7, mysql-client-8.0, + mysql-client-core-5.0, + mysql-client-core-5.1 (<< ${source:Version}), + mysql-client-core-5.5 (<< ${source:Version}), + mysql-client-core-5.6 (<< ${source:Version}), + mysql-client-core-5.7 (<< ${source:Version}), + mysql-client-core-8.0 (<< ${source:Version}), + mytop, virtual-mysql-client Provides: default-mysql-client, mysql-client, @@ -417,7 +443,10 @@ Breaks: mariadb-client-10.0, mariadb-client-10.5 (<< ${source:Version}), mariadb-server-10.3, mariadb-server-10.4, - mariadb-server-10.5 (<< ${source:Version}) + mariadb-server-10.5 (<< ${source:Version}), + mysql-server-5.6, + mysql-server-5.7, + mysql-server-8.0 Replaces: mariadb-client-10.0, mariadb-client-10.1, mariadb-client-10.2, @@ -437,6 +466,9 @@ Replaces: mariadb-client-10.0, mariadb-server-core-5.3, mariadb-server-core-5.5, mysql-server-5.0, + mysql-server-5.6, + mysql-server-5.7, + mysql-server-8.0, mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-core-5.5, @@ -500,6 +532,10 @@ Conflicts: mariadb-server (<< ${source:Version}), mariadb-tokudb-engine-10.1, mariadb-tokudb-engine-10.2, mariadb-tokudb-engine-5.5, + mysql-client-5.5 (<< ${source:Version}), + mysql-client-5.6 (<< ${source:Version}), + mysql-client-5.7 (<< ${source:Version}), + mysql-client-8.0 (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, @@ -526,6 +562,10 @@ Replaces: libmariadbclient-dev (<< 5.5.0), mariadb-tokudb-engine-10.1, mariadb-tokudb-engine-10.2, mariadb-tokudb-engine-5.5, + mysql-client-5.5 (<< ${source:Version}), + mysql-client-5.6 (<< ${source:Version}), + mysql-client-5.7 (<< ${source:Version}), + mysql-client-8.0 (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, @@ -799,6 +839,7 @@ Breaks: mariadb-server-5.5, mariadb-test-10.3, mariadb-test-10.4, mariadb-test-5.5, + mysql-server-5.7, mysql-testsuite, mysql-testsuite-5.5, mysql-testsuite-5.6, @@ -811,6 +852,7 @@ Replaces: mariadb-server-5.5, mariadb-test-10.3, mariadb-test-10.4, mariadb-test-5.5, + mysql-server-5.7, mysql-testsuite, mysql-testsuite-5.5, mysql-testsuite-5.6, |