Deb: wrap-and-sort for easier comparison to downstream in future

6 files changed, 38 insertions, 32 deletions

diff --git a/debian/control b/debian/control
index 1403bedccd6..62272177e55 100644
--- a/debian/control
+++ b/debian/control
@@ -17,13 +17,13 @@ Build-Depends: bison,
                libjudy-dev,
                libkrb5-dev,
                libncurses5-dev (>= 5.0-6~),
+               libnuma-dev,
                libpam0g-dev,
                libpcre3-dev (>= 2:8.35-3.2~),
                libreadline-gplv2-dev,
                libssl-dev,
                libsystemd-dev,
                libxml2-dev,
-               libnuma-dev,
                lsb-release,
                perl (>= 5.6.0),
                po-debconf,
@@ -46,8 +46,14 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
            mariadb-server-5.2,
            mariadb-server-5.3,
            mariadb-server-5.5 (<< 5.5.33)
-Replaces: libmariadbclient18, libmysqlclient18, libmysqlclient19, libmysqlclient20
-Provides: libmariadbclient18, libmysqlclient18, libmysqlclient19, libmysqlclient20
+Replaces: libmariadbclient18,
+          libmysqlclient18,
+          libmysqlclient19,
+          libmysqlclient20
+Provides: libmariadbclient18,
+          libmysqlclient18,
+          libmysqlclient19,
+          libmysqlclient20
 Description: MariaDB database client library
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -87,8 +93,8 @@ Architecture: any
 Section: libdevel
 Provides: libmysqld-dev
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmariadbd19,
-         libmariadb-dev (= ${binary:Version}),
+Depends: libmariadb-dev (= ${binary:Version}),
+         libmariadbd19,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmysqld-dev
@@ -123,15 +129,15 @@ Depends: libmariadb3 (= ${binary:Version}),
          zlib1g-dev,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libmysqlclient-dev, libmariadbclient-dev
-Replaces: libmysqlclient-dev, libmariadbclient-dev
+Breaks: libmariadbclient-dev, libmysqlclient-dev
+Replaces: libmariadbclient-dev, libmysqlclient-dev
 Conflicts: libmariadbclient16-dev,
            libmysqlclient10-dev,
            libmysqlclient12-dev,
            libmysqlclient14-dev,
            libmysqlclient15-dev,
            libmysqlclient16-dev
-Provides: libmysqlclient-dev, libmariadbclient-dev, libmariadbclient-dev-compat
+Provides: libmariadbclient-dev, libmariadbclient-dev-compat, libmysqlclient-dev
 Description: MariaDB database development files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -212,12 +218,12 @@ Replaces: mariadb-client-10.0,
           mysql-client-core-5.6,
           mysql-client-core-5.7,
           virtual-mysql-client-core
-Provides: mysql-client-core,
+Provides: default-mysql-client-core,
+          mysql-client-core,
           mysql-client-core-5.1,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
           mysql-client-core-5.7,
-          default-mysql-client-core,
           virtual-mysql-client-core
 Description: MariaDB database core client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -264,13 +270,13 @@ Replaces: mariadb-client (<< ${source:Version}),
           mysql-client-5.6,
           mysql-client-5.7,
           virtual-mysql-client
-Provides: mysql-client,
+Provides: default-mysql-client,
+          mysql-client,
           mysql-client-4.1,
           mysql-client-5.1,
           mysql-client-5.5,
           mysql-client-5.6,
           mysql-client-5.7,
-          default-mysql-client,
           virtual-mysql-client
 Recommends: libdbd-mysql-perl (>= 1.2202), libdbi-perl, libterm-readkey-perl
 Description: MariaDB database client binaries
@@ -301,13 +307,13 @@ Conflicts: mariadb-server-core-10.0,
            mysql-server-core-5.6,
            mysql-server-core-5.7,
            virtual-mysql-server-core
-Breaks: mariadb-server-10.2 (<< ${source:Version}),
-        mariadb-client-10.2 (<< ${source:Version}),
+Breaks: mariadb-client-10.0,
         mariadb-client-10.1,
-        mariadb-client-10.0
-Replaces: mariadb-client-10.2 (<< ${source:Version}),
+        mariadb-client-10.2 (<< ${source:Version}),
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
-          mariadb-client-10.0,
+          mariadb-client-10.2 (<< ${source:Version}),
           mariadb-server-10.2 (<< ${source:Version}),
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
@@ -322,12 +328,12 @@ Replaces: mariadb-client-10.2 (<< ${source:Version}),
           mysql-server-core-5.6,
           mysql-server-core-5.7,
           virtual-mysql-server-core
-Provides: mysql-server-core,
+Provides: default-mysql-server-core,
+          mysql-server-core,
           mysql-server-core-5.1,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
           mysql-server-core-5.7,
-          default-mysql-server-core,
           virtual-mysql-server-core
 Description: MariaDB database core server files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -398,7 +404,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mysql-server-5.6,
           mysql-server-5.7,
           virtual-mysql-server
-Provides: virtual-mysql-server, default-mysql-server
+Provides: default-mysql-server, virtual-mysql-server
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -438,19 +444,19 @@ Depends: mariadb-client-10.2 (= ${binary:Version}),
          mariadb-test-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: mariadb-test-10.0,
+Breaks: mariadb-server-5.5,
+        mariadb-test-10.0,
         mariadb-test-10.1,
         mariadb-test-5.5,
-        mariadb-server-5.5,
         mysql-testsuite,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
         virtual-mysql-testsuite
-Replaces: mariadb-test-10.0,
+Replaces: mariadb-server-5.5,
+          mariadb-test-10.0,
           mariadb-test-10.1,
           mariadb-test-5.5,
-          mariadb-server-5.5,
           mysql-testsuite,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,
diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install
index f198bb4014c..0e0c0cdc82f 100644
--- a/debian/libmariadb3.install
+++ b/debian/libmariadb3.install
@@ -1,5 +1,5 @@
-usr/lib/mariadb/libmariadb.so.*
 usr/lib/*/libmariadbclient.so.*
 usr/lib/*/libmysqlclient.so.*
+usr/lib/mariadb/libmariadb.so.*
 usr/lib/mysql/plugin/dialog.so
 usr/lib/mysql/plugin/mysql_clear_password.so
diff --git a/debian/libmariadbd-dev.install b/debian/libmariadbd-dev.install
index d973838d99f..6fe225b15ba 100644
--- a/debian/libmariadbd-dev.install
+++ b/debian/libmariadbd-dev.install
@@ -1,3 +1,3 @@
+usr/bin/mariadb_config
 usr/lib/*/libmysqld.a
 usr/lib/*/libmysqld.so
-usr/bin/mariadb_config
diff --git a/debian/mariadb-plugin-cracklib-password-check.install b/debian/mariadb-plugin-cracklib-password-check.install
index 9b4e38f97d4..7cc3fdc2b3e 100644
--- a/debian/mariadb-plugin-cracklib-password-check.install
+++ b/debian/mariadb-plugin-cracklib-password-check.install
@@ -1,2 +1,2 @@
-usr/lib/mysql/plugin/cracklib_password_check.so
 etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d
+usr/lib/mysql/plugin/cracklib_password_check.so
diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install
index f37fc5ad259..537f459d2d2 100644
--- a/debian/mariadb-plugin-gssapi-server.install
+++ b/debian/mariadb-plugin-gssapi-server.install
@@ -1,2 +1,2 @@
-usr/lib/mysql/plugin/auth_gssapi.so
 etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
+usr/lib/mysql/plugin/auth_gssapi.so
diff --git a/debian/mariadb-server-10.2.install b/debian/mariadb-server-10.2.install
index e8470b757c0..71aeb1f560b 100644
--- a/debian/mariadb-server-10.2.install
+++ b/debian/mariadb-server-10.2.install
@@ -3,11 +3,15 @@ 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
 etc/apparmor.d/usr.sbin.mysqld
+lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
 usr/bin/aria_chk
 usr/bin/aria_dump_log
 usr/bin/aria_ftdump
 usr/bin/aria_pack
 usr/bin/aria_read_log
+usr/bin/galera_new_cluster
+usr/bin/galera_recovery
+usr/bin/mariadb-service-convert
 usr/bin/msql2mysql
 usr/bin/my_print_defaults
 usr/bin/myisam_ftdump
@@ -63,7 +67,3 @@ usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 usr/share/mysql/wsrep_notify
-usr/bin/galera_new_cluster
-usr/bin/galera_recovery
-usr/bin/mariadb-service-convert
-lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf