Skip to content

Commit

Permalink
Revert "MDEV-23342 MariaDB cannot be installed over MySQL 5.7.30 on B…
Browse files Browse the repository at this point in the history 
…ionic anymore"

This reverts commit 4488527.

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 e7c7f5c where this
unsorted debian/control file was sorted.
  • Loading branch information
@ottok
ottok committed Mar 29, 2021
1 parent e8b7fce commit ab3777a
Showing 1 changed file with 112 additions and 30 deletions.
142 changes: 112 additions & 30 deletions debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down

0 comments on commit ab3777a

Please sign in to comment.