Deb: Run 'wrap-and-sort -a' so comparison across releases is easier

8 files changed, 28 insertions, 27 deletions

diff --git a/debian/control b/debian/control
index 245eac71151..e6b23f9f8ce 100644
--- a/debian/control
+++ b/debian/control
@@ -234,7 +234,8 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
 
 Package: mariadb-client-core-10.4
 Architecture: any
-Depends: mariadb-common (>= ${source:Version}), libmariadb3,
+Depends: libmariadb3,
+         mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-client-10.0,
diff --git a/debian/mariadb-client-10.4.install b/debian/mariadb-client-10.4.install
index 9cb4ee3dede..4cd0af71c24 100644
--- a/debian/mariadb-client-10.4.install
+++ b/debian/mariadb-client-10.4.install
@@ -10,16 +10,6 @@ usr/bin/mysqldumpslow
 usr/bin/mysqlimport
 usr/bin/mysqlshow
 usr/bin/mysqlslap
-usr/share/man/man1/mysql_find_rows.1
-usr/share/man/man1/mysql_fix_extensions.1
-usr/share/man/man1/mysql_waitpid.1
-usr/share/man/man1/mysqlaccess.1
-usr/share/man/man1/mysqladmin.1
-usr/share/man/man1/mysqldump.1
-usr/share/man/man1/mysqldumpslow.1
-usr/share/man/man1/mysqlimport.1
-usr/share/man/man1/mysqlshow.1
-usr/share/man/man1/mysqlslap.1
 usr/share/man/man1/mariadb-access.1
 usr/share/man/man1/mariadb-admin.1
 usr/share/man/man1/mariadb-binlog.1
@@ -31,3 +21,13 @@ usr/share/man/man1/mariadb-import.1
 usr/share/man/man1/mariadb-plugin.1
 usr/share/man/man1/mariadb-slap.1
 usr/share/man/man1/mariadb-waitpid.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysql_waitpid.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
diff --git a/debian/mariadb-client-core-10.4.install b/debian/mariadb-client-core-10.4.install
index 0706b272e8a..4cc61674770 100644
--- a/debian/mariadb-client-core-10.4.install
+++ b/debian/mariadb-client-core-10.4.install
@@ -1,6 +1,6 @@
 usr/bin/mysql
 usr/bin/mysqlcheck
+usr/share/man/man1/mariadb-check.1
+usr/share/man/man1/mariadb.1
 usr/share/man/man1/mysql.1
 usr/share/man/man1/mysqlcheck.1
-usr/share/man/man1/mariadb.1
-usr/share/man/man1/mariadb-check.1
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
index a2b8b805cdb..3e6e3d4b00e 100644
--- a/debian/mariadb-plugin-rocksdb.install
+++ b/debian/mariadb-plugin-rocksdb.install
@@ -1,7 +1,7 @@
 etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb
-usr/share/man/man1/mariadb-ldb.1
-usr/share/man/man1/mysql_ldb.1
 usr/bin/sst_dump
 usr/lib/mysql/plugin/ha_rocksdb.so
+usr/share/man/man1/mariadb-ldb.1
+usr/share/man/man1/mysql_ldb.1
diff --git a/debian/mariadb-server-10.4.install b/debian/mariadb-server-10.4.install
index 6d08243d675..b6bfb04a344 100644
--- a/debian/mariadb-server-10.4.install
+++ b/debian/mariadb-server-10.4.install
@@ -1,8 +1,8 @@
 debian/additions/debian-start etc/mysql
 debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
-debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
 debian/additions/mysql.init usr/share/mysql
+debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d
 etc/apparmor.d/usr.sbin.mysqld
 lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
 usr/bin/aria_chk
diff --git a/debian/mariadb-server-core-10.4.install b/debian/mariadb-server-core-10.4.install
index 24f967252a2..9139949a24e 100644
--- a/debian/mariadb-server-core-10.4.install
+++ b/debian/mariadb-server-core-10.4.install
@@ -3,12 +3,12 @@ usr/bin/mysql_install_db
 usr/bin/mysql_upgrade
 usr/sbin/mysqld
 usr/share/man/man1/innochecksum.1
-usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man8/mysqld.8
 usr/share/man/man1/mariadb-install-db.1
 usr/share/man/man1/mariadb-upgrade.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_upgrade.1
 usr/share/man/man8/mariadbd.8
+usr/share/man/man8/mysqld.8
 usr/share/mysql/charsets
 usr/share/mysql/czech
 usr/share/mysql/danish
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index 5d3afda68d4..fc7a707c007 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -17,16 +17,16 @@ usr/lib/mysql/plugin/qa_auth_client.so
 usr/lib/mysql/plugin/qa_auth_interface.so
 usr/lib/mysql/plugin/qa_auth_server.so
 usr/lib/mysql/plugin/test_versioning.so
+usr/share/man/man1/mariadb-client-test-embedded.1
+usr/share/man/man1/mariadb-client-test.1
+usr/share/man/man1/mariadb-test-embedded.1
+usr/share/man/man1/mariadb-test.1
 usr/share/man/man1/mysql-stress-test.pl.1
 usr/share/man/man1/mysql-test-run.pl.1
 usr/share/man/man1/mysql_client_test.1
 usr/share/man/man1/mysql_client_test_embedded.1
 usr/share/man/man1/mysqltest.1
 usr/share/man/man1/mysqltest_embedded.1
-usr/share/man/man1/mariadb-client-test-embedded.1
-usr/share/man/man1/mariadb-client-test.1
-usr/share/man/man1/mariadb-test-embedded.1
-usr/share/man/man1/mariadb-test.1
 usr/share/mysql/mysql-test/README
 usr/share/mysql/mysql-test/README-gcov
 usr/share/mysql/mysql-test/README.stress
diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links
index 8b9ca6fe98b..504e0a0b557 100644
--- a/debian/mariadb-test.links
+++ b/debian/mariadb-test.links
@@ -1,6 +1,6 @@
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
-usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
-usr/bin/mysql_client_test_embedded usr/bin/mariadb-client-test-embedded
-usr/bin/mysqltest_embedded usr/bin/mariadb-test-embedded
 usr/bin/mysql_client_test usr/bin/mariadb-client-test
+usr/bin/mysql_client_test_embedded usr/bin/mariadb-client-test-embedded
 usr/bin/mysqltest usr/bin/mariadb-test
+usr/bin/mysqltest_embedded usr/bin/mariadb-test-embedded
+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run