Deb: Run 'wrap-and-sort -av' to debian/ contents is easier to compare

Maintaining the same deterministic file order in both upstream (this) and
downstream (Debian) repositories makes it easier to compare the delta.

3 files changed, 30 insertions, 30 deletions

diff --git a/debian/control b/debian/control
index 8d758ef1d90..4bd68939f00 100644
--- a/debian/control
+++ b/debian/control
@@ -284,15 +284,15 @@ Conflicts: mariadb-client-10.0,
            mysql-client-core-5.7,
            mysql-client-core-8.0,
            virtual-mysql-client-core
-Replaces: mariadb-client-core-5.1,
-          mariadb-client-core-5.2,
-          mariadb-client-core-5.3,
-          mariadb-client-core-5.5,
-          mariadb-client-core-10.0,
+Replaces: 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-5.1,
+          mariadb-client-core-5.2,
+          mariadb-client-core-5.3,
+          mariadb-client-core-5.5,
           mysql-client-core-5.1,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
@@ -343,15 +343,15 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-core-8.0,
            mytop,
            virtual-mysql-client
-Replaces: mariadb-client-5.1,
-          mariadb-client-5.2,
-          mariadb-client-5.3,
-          mariadb-client-5.5,
-          mariadb-client-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-5.1,
+          mariadb-client-5.2,
+          mariadb-client-5.3,
+          mariadb-client-5.5,
           mysql-client-5.0,
           mysql-client-5.1,
           mysql-client-5.5,
@@ -396,15 +396,15 @@ Conflicts: mariadb-server-core-10.0,
            mysql-server-core-5.7,
            mysql-server-core-8.0,
            virtual-mysql-server-core
-Replaces: mariadb-server-core-5.1,
-          mariadb-server-core-5.2,
-          mariadb-server-core-5.3,
-          mariadb-server-core-5.5,
-          mariadb-server-core-10.0,
+Replaces: mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-10.2,
           mariadb-server-core-10.3,
           mariadb-server-core-10.4,
+          mariadb-server-core-5.1,
+          mariadb-server-core-5.2,
+          mariadb-server-core-5.3,
+          mariadb-server-core-5.5,
           mysql-server-core-5.0,
           mysql-server-core-5.1,
           mysql-server-core-5.5,
@@ -471,15 +471,15 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mysql-server-5.7,
            mysql-server-8.0,
            virtual-mysql-server
-Replaces: mariadb-server-5.1,
-          mariadb-server-5.2,
-          mariadb-server-5.3,
-          mariadb-server-5.5,
-          mariadb-server-10.0,
+Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
           mariadb-server-10.3,
           mariadb-server-10.4,
+          mariadb-server-5.1,
+          mariadb-server-5.2,
+          mariadb-server-5.3,
+          mariadb-server-5.5,
           mysql-server-4.1,
           mysql-server-5.0,
           mysql-server-5.1,
@@ -712,18 +712,18 @@ Depends: mariadb-client-10.5 (= ${binary:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-test-5.5,
-        mariadb-test-10.0,
+Breaks: mariadb-test-10.0,
         mariadb-test-10.1,
         mariadb-test-10.2,
         mariadb-test-10.3,
         mariadb-test-10.4,
-Replaces: mariadb-test-5.5,
-          mariadb-test-10.0,
+        mariadb-test-5.5
+Replaces: mariadb-test-10.0,
           mariadb-test-10.1,
           mariadb-test-10.2,
           mariadb-test-10.3,
           mariadb-test-10.4,
+          mariadb-test-5.5,
           virtual-mysql-testsuite
 Provides: virtual-mysql-testsuite
 Suggests: patch
@@ -741,23 +741,23 @@ Multi-Arch: foreign
 Depends: ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-test-data-5.5,
-        mariadb-test-data-10.0,
+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,
         mysql-testsuite,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
         mysql-testsuite-8.0
-Replaces: mariadb-test-data-5.5,
-          mariadb-test-data-10.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,
           mysql-testsuite,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,
diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.5.install
index 67842703af4..874e2ff19bf 100644
--- a/debian/mariadb-server-10.5.install
+++ b/debian/mariadb-server-10.5.install
@@ -3,7 +3,6 @@ debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
 debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
-support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
 debian/additions/source_mariadb-10.5.py usr/share/apport/package-hooks
 etc/apparmor.d/usr.sbin.mariadbd
 etc/security/user_map.conf
@@ -11,6 +10,7 @@ lib/*/security/pam_user_map.so
 lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
 lib/systemd/system/mysql.service
 lib/systemd/system/mysqld.service
+support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
 usr/bin/aria_chk
 usr/bin/aria_dump_log
 usr/bin/aria_ftdump
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index 56947ac78ef..bbcc200c368 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -8,7 +8,6 @@ usr/lib/*/libmariadb3/plugin/qa_auth_interface.so
 usr/lib/mysql/plugin/adt_null.so
 usr/lib/mysql/plugin/auth_0x0100.so
 usr/lib/mysql/plugin/auth_test_plugin.so
-usr/lib/mysql/plugin/test_sql_service.so
 usr/lib/mysql/plugin/daemon_example.ini
 usr/lib/mysql/plugin/debug_key_management.so
 usr/lib/mysql/plugin/dialog_examples.so
@@ -20,6 +19,7 @@ usr/lib/mysql/plugin/libdaemon_example.so
 usr/lib/mysql/plugin/mypluglib.so
 usr/lib/mysql/plugin/qa_auth_interface.so
 usr/lib/mysql/plugin/qa_auth_server.so
+usr/lib/mysql/plugin/test_sql_service.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