Skip to content

M
MariaDB
Commit 2c529414 authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Daniel Black
Browse files
Options

Deb: Run wrap-and-sort -av 

Sort and organize the Debian packaging files.

Also revert 4d032694 that was done in vain.
For the sake of CI we do want to have working upgrades from previous 10.9
releases and it is doable with another kind of fix in a later commit.
parent 0b14dbd4
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 25 deletions
debian/control
View file @ 2c529414
......@@ -269,7 +269,8 @@ Depends: libmariadb3 (>= 10.5.4),
mariadb-common (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Conflicts: mariadb-client-10.0,
Conflicts: mariadb-client (<< ${source:Version}),
mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
mariadb-client-10.3,
......@@ -278,7 +279,6 @@ Conflicts: mariadb-client-10.0,
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client (<< ${source:Version}),
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
......@@ -308,6 +308,7 @@ Conflicts: mariadb-client-10.0,
virtual-mysql-client-core
Breaks: mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-core (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
......@@ -317,7 +318,6 @@ Breaks: mariadb-server-10.0,
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core (<< ${source:Version}),
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
......@@ -325,7 +325,8 @@ Breaks: mariadb-server-10.0,
percona-server-server-5.6,
percona-xtradb-cluster-server-5.6,
percona-xtradb-cluster-server-5.7
Replaces: mariadb-client-10.0,
Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
mariadb-client-10.3,
......@@ -335,7 +336,6 @@ Replaces: mariadb-client-10.0,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client (<< ${source:Version}),
mariadb-client-5.1,
mariadb-client-5.2,
mariadb-client-5.3,
......@@ -355,6 +355,7 @@ Replaces: mariadb-client-10.0,
mariadb-client-core-5.5,
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-core (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
......@@ -365,7 +366,6 @@ Replaces: mariadb-client-10.0,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core-10.9,
mariadb-server-core (<< ${source:Version}),
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
......@@ -433,7 +433,8 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client-core-8.0,
mytop,
virtual-mysql-client
Breaks: mariadb-client-core-10.0,
Breaks: mariadb-client-core (<< ${source:Version}),
mariadb-client-core-10.0,
mariadb-client-core-10.1,
mariadb-client-core-10.2,
mariadb-client-core-10.3,
......@@ -442,7 +443,8 @@ Breaks: mariadb-client-core-10.0,
mariadb-client-core-10.6,
mariadb-client-core-10.7,
mariadb-client-core-10.8,
mariadb-client-core (<< ${source:Version}),
mariadb-client-core-10.9,
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
......@@ -452,7 +454,8 @@ Breaks: mariadb-client-core-10.0,
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server (<< ${source:Version}),
mariadb-server-10.9,
mariadb-server-core (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
......@@ -462,7 +465,6 @@ Breaks: mariadb-client-core-10.0,
mariadb-server-core-10.6,
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core (<< ${source:Version}),
mysql-server-5.5,
mysql-server-5.6,
mysql-server-5.7,
......@@ -489,6 +491,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-5.2,
mariadb-client-5.3,
mariadb-client-5.5,
mariadb-client-core (<< ${source:Version}),
mariadb-client-core-10.0,
mariadb-client-core-10.1,
mariadb-client-core-10.2,
......@@ -499,7 +502,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-core-10.7,
mariadb-client-core-10.8,
mariadb-client-core-10.9,
mariadb-client-core (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
......@@ -510,7 +513,7 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server (<< ${source:Version}),
mariadb-server-core (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
......@@ -521,7 +524,6 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-server-core-10.7,
mariadb-server-core-10.8,
mariadb-server-core-10.9,
mariadb-server-core (<< ${source:Version}),
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
......@@ -590,7 +592,8 @@ Conflicts: mariadb-server-core-10.0,
mysql-server-core-5.7,
mysql-server-core-8.0,
virtual-mysql-server-core
Breaks: mariadb-client-10.0,
Breaks: mariadb-client (<< ${source:Version}),
mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
mariadb-client-10.3,
......@@ -599,7 +602,8 @@ Breaks: mariadb-client-10.0,
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client (<< ${source:Version}),
mariadb-client-10.9,
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.3,
......@@ -608,7 +612,7 @@ Breaks: mariadb-client-10.0,
mariadb-server-10.6,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server (<< ${source:Version}),
mariadb-server-10.9,
mysql-client-5.5,
mysql-server-5.5,
mysql-server-5.6,
......@@ -617,7 +621,8 @@ Breaks: mariadb-client-10.0,
percona-server-server-5.6,
percona-xtradb-cluster-server-5.6,
percona-xtradb-cluster-server-5.7
Replaces: mariadb-client-10.0,
Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
mariadb-client-10.3,
......@@ -627,7 +632,7 @@ Replaces: mariadb-client-10.0,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.3,
......@@ -637,7 +642,6 @@ Replaces: mariadb-client-10.0,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server (<< ${source:Version}),
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
......@@ -742,12 +746,13 @@ Breaks: handlersocket-mysql-5.5,
Replaces: handlersocket-mysql-5.5,
libmariadbclient-dev (<< 5.5.0),
libmariadbclient16,
mariadb-client (<< ${source:Version}),
mariadb-client-10.5,
mariadb-client-10.6,
mariadb-client-10.7,
mariadb-client-10.8,
mariadb-client-10.9,
mariadb-client (<< ${source:Version}),
mariadb-server (<< ${source:Version}),
mariadb-server-10.0,
mariadb-server-10.1,
mariadb-server-10.2,
......@@ -758,7 +763,6 @@ Replaces: handlersocket-mysql-5.5,
mariadb-server-10.7,
mariadb-server-10.8,
mariadb-server-10.9,
mariadb-server (<< ${source:Version}),
mariadb-server-5.1,
mariadb-server-5.2,
mariadb-server-5.3,
......
debian/mariadb-test.install
View file @ 2c529414
......@@ -37,8 +37,8 @@ usr/share/mysql/mysql-test/README.stress
usr/share/mysql/mysql-test/dgcov.pl
usr/share/mysql/mysql-test/lib
usr/share/mysql/mysql-test/mariadb-stress-test.pl
usr/share/mysql/mysql-test/mysql-test-run.pl
usr/share/mysql/mysql-test/mariadb-test-run.pl
usr/share/mysql/mysql-test/mysql-test-run.pl
usr/share/mysql/mysql-test/purify.supp
usr/share/mysql/mysql-test/suite.pm
usr/share/mysql/mysql-test/valgrind.supp
debian/mariadb-test.links
View file @ 2c529414
......@@ -2,7 +2,7 @@ usr/bin/mariadb-client-test usr/bin/mysql_client_test
usr/bin/mariadb-client-test-embedded usr/bin/mysql_client_test_embedded
usr/bin/mariadb-test usr/bin/mysqltest
usr/bin/mariadb-test-embedded usr/bin/mysqltest_embedded
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run.pl
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mtr
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mariadb-test-run
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mtr
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
usr/share/mysql/mysql-test/mariadb-test-run.pl usr/share/mysql/mysql-test/mysql-test-run.pl
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7