Deb: Streamline package listing order to make comparisons downstream easier

2 files changed, 123 insertions, 123 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 9345267b7a7..198cba8a467 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -47,7 +47,7 @@ fi
 if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1
 then
   sed '/libcrack2-dev/d' -i debian/control
-  sed '/Package: mariadb-plugin-cracklib/,+10d' -i debian/control
+  sed '/Package: mariadb-plugin-cracklib/,+9d' -i debian/control
 fi
 
 # If libpcre3-dev (>= 2:8.35-3.2~) is not available (before Debian Jessie or Ubuntu Wily)
diff --git a/debian/control b/debian/control
index 62272177e55..d0ecf4bddc3 100644
--- a/debian/control
+++ b/debian/control
@@ -62,50 +62,55 @@ Description: MariaDB database client library
  .
  This package includes the client library.
 
-Package: libmysqlclient18
+Package: libmariadbclient18
 Section: libs
 Architecture: any
 Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends}
 Description: Virtual package to satisfy external depends
- This is an empty package that depends on the libmariadb3
- package.
- .
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
+ .
+ This is an empty package that depends on the libmariadb3
+ package.
 
-Package: libmariadbclient18
+Package: libmysqlclient18
 Section: libs
 Architecture: any
 Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends}
 Description: Virtual package to satisfy external depends
- This is an empty package that depends on the libmariadb3
- package.
- .
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
+ .
+ This is an empty package that depends on the libmariadb3
+ package.
 
-Package: libmariadbd-dev
+Package: libmariadb-dev
 Architecture: any
 Section: libdevel
-Provides: libmysqld-dev
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libmariadb-dev (= ${binary:Version}),
-         libmariadbd19,
+Depends: libmariadb3 (= ${binary:Version}),
+         zlib1g-dev,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libmysqld-dev
-Replaces: libmysqld-dev
-Description: MariaDB embedded database, development files
+Breaks: libmariadbclient-dev, libmysqlclient-dev
+Replaces: libmariadbclient-dev, libmysqlclient-dev
+Conflicts: libmariadbclient16-dev,
+           libmysqlclient10-dev,
+           libmysqlclient12-dev,
+           libmysqlclient14-dev,
+           libmysqlclient15-dev,
+           libmysqlclient16-dev
+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
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes the embedded server library development and header files.
+ This package includes development libraries and header files.
 
 Package: libmariadbd19
 Architecture: any
@@ -122,29 +127,24 @@ Description: MariaDB embedded database, shared library
  .
  This package includes a shared library for embedded MariaDB applications
 
-Package: libmariadb-dev
+Package: libmariadbd-dev
 Architecture: any
 Section: libdevel
-Depends: libmariadb3 (= ${binary:Version}),
-         zlib1g-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libmariadbclient-dev, libmysqlclient-dev
-Replaces: libmariadbclient-dev, libmysqlclient-dev
-Conflicts: libmariadbclient16-dev,
-           libmysqlclient10-dev,
-           libmysqlclient12-dev,
-           libmysqlclient14-dev,
-           libmysqlclient15-dev,
-           libmysqlclient16-dev
-Provides: libmariadbclient-dev, libmariadbclient-dev-compat, libmysqlclient-dev
-Description: MariaDB database development files
+Provides: libmysqld-dev
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libmariadb-dev (= ${binary:Version}),
+        libmariadbd19 (= ${binary:Version}),
+        ${misc:Depends},
+        ${shlibs:Depends}
+Breaks: libmysqld-dev
+Replaces: libmysqld-dev
+Description: MariaDB embedded 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
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes development libraries and header files.
+ This package includes the embedded server library development and header files.
 
 Package: mysql-common
 Architecture: all
@@ -437,68 +437,6 @@ Description: MariaDB database client (metapackage depending on the latest versio
  maintainers.  Install this package if in doubt about which MariaDB version
  you want, as this is the one considered to be in the best shape.
 
-Package: mariadb-test
-Architecture: any
-Depends: mariadb-client-10.2 (= ${binary:Version}),
-         mariadb-server-10.2 (= ${binary:Version}),
-         mariadb-test-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: mariadb-server-5.5,
-        mariadb-test-10.0,
-        mariadb-test-10.1,
-        mariadb-test-5.5,
-        mysql-testsuite,
-        mysql-testsuite-5.5,
-        mysql-testsuite-5.6,
-        mysql-testsuite-5.7,
-        virtual-mysql-testsuite
-Replaces: mariadb-server-5.5,
-          mariadb-test-10.0,
-          mariadb-test-10.1,
-          mariadb-test-5.5,
-          mysql-testsuite,
-          mysql-testsuite-5.5,
-          mysql-testsuite-5.6,
-          mysql-testsuite-5.7,
-          virtual-mysql-testsuite
-Provides: virtual-mysql-testsuite
-Suggests: patch
-Description: MariaDB database regression test suite
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the regression test suite.
-
-Package: mariadb-test-data
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: mariadb-test-10.0,
-        mariadb-test-10.1,
-        mariadb-test-5.5,
-        mariadb-test-data-10.0,
-        mysql-testsuite,
-        mysql-testsuite-5.5,
-        mysql-testsuite-5.6,
-        mysql-testsuite-5.7
-Replaces: mariadb-test-10.0,
-          mariadb-test-10.1,
-          mariadb-test-5.5,
-          mariadb-test-data-10.0,
-          mysql-testsuite,
-          mysql-testsuite-5.5,
-          mysql-testsuite-5.6,
-          mysql-testsuite-5.7
-Description: MariaDB database regression test suite - data 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
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package has the architecture independent data files for the test suite.
-
 Package: mariadb-plugin-connect
 Architecture: any
 Depends: libxml2,
@@ -527,11 +465,11 @@ Description: OQGraph storage engine for MariaDB
 Package: mariadb-plugin-tokudb
 Architecture: any
 Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}),
-        mariadb-server-10.1 (<< ${source:Version}),
+Breaks: mariadb-server-10.0,
+        mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}),
-          mariadb-server-10.1 (<< ${source:Version}),
+Replaces: mariadb-server-10.0,
+          mariadb-server-10.1,
           mariadb-server-10.2 (<< ${source:Version})
 Description: TokuDB storage engine for MariaDB
  The TokuDB storage engine is for use in high-performance and write-intensive
@@ -542,25 +480,40 @@ Description: TokuDB storage engine for MariaDB
 Package: mariadb-plugin-mroonga
 Architecture: any
 Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}),
-        mariadb-server-10.1 (<< ${source:Version}),
+Breaks: mariadb-server-10.0,
+        mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}),
-          mariadb-server-10.1 (<< ${source:Version}),
+Replaces: mariadb-server-10.0,
+          mariadb-server-10.1,
           mariadb-server-10.2 (<< ${source:Version})
 Description: Mroonga storage engine for MariaDB
  Mroonga (formerly named Groonga Storage Engine) is a storage engine that
  provides fast CJK-ready full text searching using column store.
  This package contains the Mroonga plugin for MariaDB.
 
+Package: mariadb-plugin-spider
+Architecture: any
+Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
+Breaks: mariadb-server-10.0,
+        mariadb-server-10.1,
+        mariadb-server-10.2 (<< ${source:Version})
+Replaces: mariadb-server-10.0,
+          mariadb-server-10.1,
+          mariadb-server-10.2 (<< ${source:Version})
+Description: Spider storage engine for MariaDB
+ The Spider storage engine with built-in sharding features. It supports
+ partitioning and xa transactions, and allows tables of different MariaDB
+ instances to be handled as if they were on the same insctance. It refers to one
+ possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
+
 Package: mariadb-plugin-cassandra
 Architecture: any
 Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}),
-        mariadb-server-10.1 (<< ${source:Version}),
+Breaks: mariadb-server-10.0,
+        mariadb-server-10.1,
         mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}),
-          mariadb-server-10.1 (<< ${source:Version}),
+Replaces: mariadb-server-10.0,
+          mariadb-server-10.1,
           mariadb-server-10.2 (<< ${source:Version})
 Description: Cassandra storage engine for MariaDB
  The Cassandra Storage Engine allows access to data in a Cassandra cluster from
@@ -570,21 +523,6 @@ Description: Cassandra storage engine for MariaDB
  it is possible to join data that's stored in MariaDB with data that's stored in
  Cassandra.
 
-Package: mariadb-plugin-spider
-Architecture: any
-Depends: mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
-Breaks: mariadb-server-10.0 (<< ${source:Version}),
-        mariadb-server-10.1 (<< ${source:Version}),
-        mariadb-server-10.2 (<< ${source:Version})
-Replaces: mariadb-server-10.0 (<< ${source:Version}),
-          mariadb-server-10.1 (<< ${source:Version}),
-          mariadb-server-10.2 (<< ${source:Version})
-Description: Spider storage engine for MariaDB
- The Spider storage engine with built-in sharding features. It supports
- partitioning and xa transactions, and allows tables of different MariaDB
- instances to be handled as if they were on the same insctance. It refers to one
- possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
-
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
@@ -614,3 +552,65 @@ Depends: libcrack2 (>= 2.9.0),
 Description: CrackLib Password Validation Plugin for MariaDB
  This password validation plugin uses cracklib to allow only
  sufficiently secure (as defined by cracklib) user passwords in MariaDB.
+
+Package: mariadb-test
+Architecture: any
+Depends: mariadb-client-10.2 (= ${binary:Version}),
+         mariadb-server-10.2 (= ${binary:Version}),
+         mariadb-test-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-server-5.5,
+        mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7,
+        virtual-mysql-testsuite
+Replaces: mariadb-server-5.5,
+          mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7,
+          virtual-mysql-testsuite
+Provides: virtual-mysql-testsuite
+Suggests: patch
+Description: MariaDB database regression test suite
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the regression test suite.
+
+Package: mariadb-test-data
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mariadb-test-data-10.0,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mariadb-test-data-10.0,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7
+Description: MariaDB database regression test suite - data 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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package has the architecture independent data files for the test suite.