Deb: Extend control dependencies for MySQL 8.0 and clean up

Make package have sensible control file relations to mysql-8.0.

Also some cleanup:
- Remove obsolete versioned control relationships. When the package
  name already has a version older than current package, the extra
  version is obsolete.
- Remove obsolete postinst script that was empty
- Remove priority "extra" which is deprecated, use "optional" that
  applies for the whole source package instead.

2 files changed, 30 insertions, 27 deletions

diff --git a/debian/control b/debian/control
index 482629521a0..e033d47039c 100644
--- a/debian/control
+++ b/debian/control
@@ -47,13 +47,13 @@ Depends: mariadb-common,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: libmariadbclient18 (<< 10.2.0),
-           mariadb-galera-server-10.0 (<< 10.0.5),
-           mariadb-galera-server-5.5 (<< 5.5.33),
-           mariadb-server-10.0 (<< 10.0.5),
+           mariadb-galera-server-10.0,
+           mariadb-galera-server-5.5,
+           mariadb-server-10.0,
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
-           mariadb-server-5.5 (<< 5.5.33)
+           mariadb-server-5.5
 Breaks: libmariadbclient18 (<< ${source:Version})
 Replaces: libmariadbclient18 (<< ${source:Version})
 Description: MariaDB database client library
@@ -72,11 +72,14 @@ Depends: libmariadb3,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmysqlclient19,
-        libmysqlclient20
+        libmysqlclient20,
+        libmysqlclient21
 Replaces: libmysqlclient19,
-          libmysqlclient20
+          libmysqlclient20,
+          libmysqlclient21
 Provides: libmysqlclient19,
-          libmysqlclient20
+          libmysqlclient20,
+          libmysqlclient21
 Description: MariaDB database client library MySQL compat 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
@@ -84,7 +87,7 @@ Description: MariaDB database client library MySQL compat package
  ease of use.
  .
  This package includes the client runtime libraries that simulate and replace
- the equivalents found in MySQL 5.6 and 5.7 (mysqlclient19 and 20).
+ the equivalents found in MySQL 5.6, 5.7 and 8.0 (mysqlclient19, 20 and 21).
 
 Package: libmariadb-dev
 Architecture: any
@@ -112,7 +115,6 @@ Package: libmariadb-dev-compat
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Priority: extra
 Depends: libmariadb-dev (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libmariadb-client-lgpl-dev-compat,
@@ -260,12 +262,13 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-core-5.5,
            mysql-client (<< 5.0.51),
            mysql-client-5.0,
-           mysql-client-5.1 (<< ${source:Version}),
+           mysql-client-5.1,
            mysql-client-5.5 (<< ${source:Version}),
            mysql-client-core-5.1,
            mysql-client-core-5.5,
            mysql-client-core-5.6,
            mysql-client-core-5.7,
+           mysql-client-core-8.0,
            virtual-mysql-client-core
 Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
@@ -294,6 +297,7 @@ Replaces: mariadb-client-10.0,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
           mysql-client-core-5.7,
+          mysql-client-core-8.0,
           virtual-mysql-client-core
 Provides: default-mysql-client-core,
           mysql-client-core,
@@ -301,6 +305,7 @@ Provides: default-mysql-client-core,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
           mysql-client-core-5.7,
+          mysql-client-core-8.0,
           virtual-mysql-client-core
 Description: MariaDB database core client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -335,6 +340,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-5.5,
            mysql-client-5.6,
            mysql-client-5.7,
+           mysql-client-8.0,
            virtual-mysql-client
 Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.0,
@@ -354,14 +360,14 @@ Replaces: mariadb-client (<< ${source:Version}),
           mysql-client-5.5,
           mysql-client-5.6,
           mysql-client-5.7,
+          mysql-client-8.0,
           virtual-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,
+          mysql-client-8.0,
           virtual-mysql-client
 Recommends: libdbd-mariadb-perl,
             libdbi-perl,
@@ -395,6 +401,7 @@ Conflicts: mariadb-server-core-10.0,
            mysql-server-core-5.5,
            mysql-server-core-5.6,
            mysql-server-core-5.7,
+           mysql-server-core-8.0,
            virtual-mysql-server-core
 Breaks: mariadb-client-10.0,
         mariadb-client-10.1,
@@ -429,6 +436,7 @@ Replaces: mariadb-client-10.0,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
           mysql-server-core-5.7,
+          mysql-server-core-8.0,
           virtual-mysql-server-core
 Provides: default-mysql-server-core,
           mysql-server-core,
@@ -436,6 +444,7 @@ Provides: default-mysql-server-core,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
           mysql-server-core-5.7,
+          mysql-server-core-8.0,
           virtual-mysql-server-core
 Description: MariaDB database core server files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -491,9 +500,10 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mysql-server-5.5,
            mysql-server-5.6,
            mysql-server-5.7,
+           mysql-server-8.0,
            virtual-mysql-server
 Replaces: libmariadbclient-dev (<< 5.5.0),
-          libmariadbclient16 (<< 5.3.4),
+          libmariadbclient16,
           mariadb-client-10.5 (<< ${source:Version}),
           mariadb-server (<< ${source:Version}),
           mariadb-server-10.0,
@@ -516,6 +526,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mysql-server-5.5,
           mysql-server-5.6,
           mysql-server-5.7,
+          mysql-server-8.0,
           virtual-mysql-server
 Provides: default-mysql-server,
           virtual-mysql-server
@@ -783,6 +794,7 @@ Breaks: mariadb-server-5.5,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
+        mysql-testsuite-8.0,
         virtual-mysql-testsuite
 Replaces: mariadb-server-5.5,
           mariadb-test-10.0,
@@ -795,6 +807,7 @@ Replaces: mariadb-server-5.5,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,
           mysql-testsuite-5.7,
+          mysql-testsuite-8.0,
           virtual-mysql-testsuite
 Provides: virtual-mysql-testsuite
 Suggests: patch
@@ -818,7 +831,8 @@ Breaks: mariadb-test-10.0,
         mysql-testsuite,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
-        mysql-testsuite-5.7
+        mysql-testsuite-5.7,
+        mysql-testsuite-8.0
 Replaces: mariadb-test-10.0,
           mariadb-test-10.1,
           mariadb-test-10.2,
@@ -827,7 +841,8 @@ Replaces: mariadb-test-10.0,
           mysql-testsuite,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,
-          mysql-testsuite-5.7
+          mysql-testsuite-5.7,
+          mysql-testsuite-8.0
 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
diff --git a/debian/libmariadb3.postinst b/debian/libmariadb3.postinst
deleted file mode 100644
index 29d3b86f978..00000000000
--- a/debian/libmariadb3.postinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-# vim: ts=4
-
-