From ab3777a3bf78010748591928eb6e1fad73e399b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 26 Dec 2020 20:35:52 +0200 Subject: Revert "MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on Bionic anymore" This reverts commit 44885273f2cffd3b269fb18b0c369b343d9de512. Reverting this commit is necessary to fix missing-breaks errors in the Debian packaging. The original fix was also not entirely necessary as a fix to the original problem. Partially also reverts commit e7c7f5c1bbac9a081775a1dc50088ae1e32e2a8d where this unsorted debian/control file was sorted. --- debian/control | 142 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 112 insertions(+), 30 deletions(-) diff --git a/debian/control b/debian/control index 5d29563485e..1e0b82e3504 100644 --- a/debian/control +++ b/debian/control @@ -278,14 +278,24 @@ Conflicts: mariadb-client-10.0, mysql-client (<< 5.0.51), mysql-client-5.0, mysql-client-5.1, - mysql-client-5.5, + mysql-client-5.5 (<< ${source:Version}), mysql-client-core-5.1, mysql-client-core-5.5, mysql-client-core-5.6, mysql-client-core-5.7, mysql-client-core-8.0, virtual-mysql-client-core -Replaces: mariadb-client-core-10.0, +Replaces: mariadb-client-10.0, + mariadb-client-10.1, + mariadb-client-10.2, + mariadb-client-10.3, + mariadb-client-10.4, + mariadb-client-10.5 (<< ${source:Version}), + mariadb-client-5.1, + 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, @@ -294,6 +304,10 @@ Replaces: mariadb-client-core-10.0, mariadb-client-core-5.2, mariadb-client-core-5.3, mariadb-client-core-5.5, + mysql-client (<< 5.0.51), + mysql-client-5.0, + mysql-client-5.1, + mysql-client-5.5, mysql-client-core-5.1, mysql-client-core-5.5, mysql-client-core-5.6, @@ -337,28 +351,50 @@ Conflicts: mariadb-client (<< ${source:Version}), mysql-client-5.7, mysql-client-8.0, mysql-client-core-5.0, - mysql-client-core-5.1, - mysql-client-core-5.5, - mysql-client-core-5.6, - mysql-client-core-5.7, - mysql-client-core-8.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 -Replaces: mariadb-client-10.0, +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, mariadb-client-10.2, mariadb-client-10.3, mariadb-client-10.4, + mariadb-client-10.5 (<< ${source:Version}), mariadb-client-5.1, 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, mysql-client-5.1, mysql-client-5.5, 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, @@ -397,7 +433,28 @@ Conflicts: mariadb-server-core-10.0, mysql-server-core-5.7, mysql-server-core-8.0, virtual-mysql-server-core -Replaces: mariadb-server-core-10.0, +Breaks: mariadb-client-10.0, + mariadb-client-10.1, + mariadb-client-10.2, + mariadb-client-10.3, + mariadb-client-10.4, + mariadb-client-10.5 (<< ${source:Version}), + mariadb-server-10.3, + mariadb-server-10.4, + 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, + mariadb-client-10.3, + mariadb-client-10.4, + mariadb-client-10.5 (<< ${source:Version}), + mariadb-server-10.3, + mariadb-server-10.4, + mariadb-server-10.5 (<< ${source:Version}), + mariadb-server-core-10.0, mariadb-server-core-10.1, mariadb-server-core-10.2, mariadb-server-core-10.3, @@ -406,6 +463,10 @@ Replaces: mariadb-server-core-10.0, mariadb-server-core-5.2, 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, @@ -459,11 +520,11 @@ Conflicts: mariadb-server (<< ${source:Version}), mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5, - mysql-client-5.5, - mysql-client-5.6, - mysql-client-5.7, - mysql-client-8.0, - mysql-server, + 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, mysql-server-5.1, @@ -472,7 +533,11 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server-5.7, mysql-server-8.0, virtual-mysql-server -Replaces: mariadb-server-10.0, +Replaces: libmariadbclient-dev (<< 5.5.0), + libmariadbclient16, + mariadb-client-10.5 (<< ${source:Version}), + mariadb-server (<< ${source:Version}), + mariadb-server-10.0, mariadb-server-10.1, mariadb-server-10.2, mariadb-server-10.3, @@ -481,6 +546,11 @@ Replaces: mariadb-server-10.0, mariadb-server-5.2, mariadb-server-5.3, mariadb-server-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, mysql-server-5.1, @@ -714,18 +784,32 @@ Depends: mariadb-client-10.5 (= ${binary:Version}), ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} -Breaks: mariadb-test-10.0, +Breaks: mariadb-server-5.5, + mariadb-test-10.0, mariadb-test-10.1, mariadb-test-10.2, mariadb-test-10.3, mariadb-test-10.4, - mariadb-test-5.5 -Replaces: mariadb-test-10.0, + mariadb-test-5.5, + mysql-server-5.7, + mysql-testsuite, + mysql-testsuite-5.5, + mysql-testsuite-5.6, + mysql-testsuite-5.7, + mysql-testsuite-8.0 +Replaces: mariadb-server-5.5, + mariadb-test-10.0, mariadb-test-10.1, mariadb-test-10.2, 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, + mysql-testsuite-5.7, + mysql-testsuite-8.0, virtual-mysql-testsuite Provides: virtual-mysql-testsuite Suggests: patch @@ -743,23 +827,21 @@ Multi-Arch: foreign Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} -Breaks: mariadb-test-data-10.0, - mariadb-test-data-10.1, - mariadb-test-data-10.2, - mariadb-test-data-10.3, - mariadb-test-data-10.4, - mariadb-test-data-5.5, +Breaks: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-10.2, + mariadb-test-5.5, + mariadb-test-data-10.0, mysql-testsuite, mysql-testsuite-5.5, mysql-testsuite-5.6, mysql-testsuite-5.7, mysql-testsuite-8.0 -Replaces: mariadb-test-data-10.0, - mariadb-test-data-10.1, - mariadb-test-data-10.2, - mariadb-test-data-10.3, - mariadb-test-data-10.4, - mariadb-test-data-5.5, +Replaces: mariadb-test-10.0, + mariadb-test-10.1, + mariadb-test-10.2, + mariadb-test-5.5, + mariadb-test-data-10.0, mysql-testsuite, mysql-testsuite-5.5, mysql-testsuite-5.6, -- cgit v1.2.1