Deb: Update the control file for 10.4 package names

- Update package names that had -10.3 to -10.4
- Update conflicts/breaks/replaces of to include now also 10.3,
  just like 10.3 had the same relationship to 10.2
- Remove some old  (<< ${source:Version}) not needed anymore as we
  are not moving files around inside the 10.4 releases (at least yet).
- Ensure all plugins depend on server or client binaries from the same
  release so that they for sure are binary API compatible.

2 files changed, 52 insertions, 39 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 4d488767a97..2aa5bb975c8 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -20,7 +20,7 @@ then
 
   # Don't include test suite package on Travis-CI to make the build time shorter
   sed '/Package: mariadb-test-data/,+28d' -i debian/control
-  sed '/Package: mariadb-test/,+36d' -i debian/control
+  sed '/Package: mariadb-test$/,+38d' -i debian/control
 
   # Don't build the test package at all to save time and disk space
   sed 's|DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test|DINSTALL_MYSQLTESTDIR=false|' -i debian/rules
@@ -94,7 +94,7 @@ fi
 # x86 32 bit.
 if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]]
 then
-  sed '/Package: mariadb-plugin-rocksdb/,+14d' -i debian/control
+  sed '/Package: mariadb-plugin-rocksdb/,+15d' -i debian/control
 fi
 
 # AWS SDK requires c++11 -capable compiler.
diff --git a/debian/control b/debian/control
index 2465cfd6b27..62a47428b92 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mariadb-10.3
+Source: mariadb-10.4
 Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
@@ -230,7 +230,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
-Package: mariadb-client-core-10.3
+Package: mariadb-client-core-10.4
 Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
@@ -238,6 +238,7 @@ Depends: mariadb-common (>= ${source:Version}),
 Conflicts: mariadb-client-10.0,
            mariadb-client-10.1,
            mariadb-client-10.2,
+           mariadb-client-10.3,
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -245,6 +246,7 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-core-10.0,
            mariadb-client-core-10.1,
            mariadb-client-core-10.2,
+           mariadb-client-core-10.3,
            mariadb-client-core-5.1,
            mariadb-client-core-5.2,
            mariadb-client-core-5.3,
@@ -261,6 +263,7 @@ Conflicts: mariadb-client-10.0,
 Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
+          mariadb-client-10.3,
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -268,6 +271,7 @@ Replaces: mariadb-client-10.0,
           mariadb-client-core-10.0,
           mariadb-client-core-10.1,
           mariadb-client-core-10.2,
+          mariadb-client-core-10.3,
           mariadb-client-core-5.1,
           mariadb-client-core-5.2,
           mariadb-client-core-5.3,
@@ -296,10 +300,10 @@ Description: MariaDB database core client binaries
  .
  This package includes the core client files, as used by Akonadi.
 
-Package: mariadb-client-10.3
+Package: mariadb-client-10.4
 Architecture: any
 Depends: debianutils (>=1.6),
-         mariadb-client-core-10.3 (>= ${source:Version}),
+         mariadb-client-core-10.4 (>= ${source:Version}),
          mariadb-common,
          ${misc:Depends},
          ${perl:Depends},
@@ -308,6 +312,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mariadb-client-10.0,
            mariadb-client-10.1,
            mariadb-client-10.2,
+           mariadb-client-10.3,
            mariadb-client-5.1,
            mariadb-client-5.2,
            mariadb-client-5.3,
@@ -323,6 +328,7 @@ Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
+          mariadb-client-10.3,
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -354,13 +360,15 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mysqlreport.
 
-Package: mariadb-server-core-10.3
+Package: mariadb-server-core-10.4
 Architecture: any
 Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-server-core-10.0,
            mariadb-server-core-10.1,
+           mariadb-server-core-10.2,
+           mariadb-server-core-10.3,
            mariadb-server-core-5.1,
            mariadb-server-core-5.2,
            mariadb-server-core-5.3,
@@ -375,16 +383,17 @@ Conflicts: mariadb-server-core-10.0,
 Breaks: mariadb-client-10.0,
         mariadb-client-10.1,
         mariadb-client-10.2,
-        mariadb-client-10.3 (<< ${source:Version}),
-        mariadb-server-10.3 (<< ${source:Version})
+        mariadb-client-10.3,
+        mariadb-server-10.3
 Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
           mariadb-client-10.2,
-          mariadb-client-10.3 (<< ${source:Version}),
-          mariadb-server-10.3 (<< ${source:Version}),
+          mariadb-client-10.3,
+          mariadb-server-10.3,
           mariadb-server-core-10.0,
           mariadb-server-core-10.1,
           mariadb-server-core-10.2,
+          mariadb-server-core-10.3,
           mariadb-server-core-5.1,
           mariadb-server-core-5.2,
           mariadb-server-core-5.3,
@@ -411,7 +420,7 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-server-10.3
+Package: mariadb-server-10.4
 Architecture: any
 Suggests: mailx,
           mariadb-test,
@@ -427,8 +436,8 @@ Depends: galera-3 (>=25.3),
          libdbi-perl,
          lsb-base (>= 3.0-10),
          lsof,
-         mariadb-client-10.3 (>= ${source:Version}),
-         mariadb-server-core-10.3 (>= ${binary:Version}),
+         mariadb-client-10.4 (>= ${source:Version}),
+         mariadb-server-core-10.4 (>= ${binary:Version}),
          passwd,
          perl (>= 5.6),
          psmisc,
@@ -440,6 +449,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-10.0,
            mariadb-server-10.1,
            mariadb-server-10.2,
+           mariadb-server-10.3,
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
@@ -462,6 +472,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
+          mariadb-server-10.3,
           mariadb-server-5.1,
           mariadb-server-5.2,
           mariadb-server-5.3,
@@ -490,11 +501,11 @@ Description: MariaDB database server binaries
 
 Package: mariadb-server
 Architecture: all
-Depends: mariadb-server-10.3 (>= ${source:Version}),
+Depends: mariadb-server-10.4 (>= ${source:Version}),
          ${misc:Depends}
 Description: MariaDB database server (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-10.3), as determined by the MariaDB
+ mariadb-server (currently mariadb-server-10.4), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB
  version you need. That will install the version recommended by the
  package maintainers.
@@ -506,18 +517,18 @@ Description: MariaDB database server (metapackage depending on the latest versio
 
 Package: mariadb-client
 Architecture: all
-Depends: mariadb-client-10.3 (>= ${source:Version}),
+Depends: mariadb-client-10.4 (>= ${source:Version}),
          ${misc:Depends}
 Description: MariaDB database client (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-client (currently mariadb-client-10.3), as determined by the MariaDB
+ mariadb-client (currently mariadb-client-10.4), as determined by the MariaDB
  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-plugin-connect
 Architecture: any
 Depends: libxml2,
-         mariadb-server-10.3 (= ${binary:Version}),
+         mariadb-server-10.4 (= ${binary:Version}),
          unixodbc,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -535,7 +546,7 @@ Description: Connect storage engine for MariaDB
 
 Package: mariadb-plugin-rocksdb
 Architecture: amd64 arm64 mips64el ppc64el
-Depends: mariadb-server-10.3 (= ${binary:Version}),
+Depends: mariadb-server-10.4 (= ${binary:Version}),
          libzstd1,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -552,7 +563,7 @@ Description: RocksDB storage engine for MariaDB
 Package: mariadb-plugin-oqgraph
 Architecture: any
 Depends: libjudydebian1,
-         mariadb-server-10.3 (= ${binary:Version}),
+         mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-oqgraph-engine-10.1,
@@ -568,18 +579,18 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-tokudb
 Architecture: amd64
-Depends: mariadb-server-10.3 (= ${binary:Version}),
+Depends: mariadb-server-10.4 (= ${binary:Version}),
          libjemalloc1 (>= 3.0.0~),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2,
-        mariadb-server-10.3 (<< ${source:Version})
+        mariadb-server-10.3
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
-          mariadb-server-10.3 (<< ${source:Version})
+          mariadb-server-10.3
 Description: TokuDB storage engine for MariaDB
  The TokuDB storage engine is for use in high-performance and write-intensive
  environments, offering increased compression and better performance based
@@ -588,17 +599,17 @@ Description: TokuDB storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx
-Depends: mariadb-server-10.3 (= ${binary:Version}),
+Depends: mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2,
-        mariadb-server-10.3 (<< ${source:Version})
+        mariadb-server-10.3
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
-          mariadb-server-10.3 (<< ${source:Version})
+          mariadb-server-10.3
 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.
@@ -606,17 +617,17 @@ Description: Mroonga storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.3 (= ${binary:Version}),
+Depends: mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2,
-        mariadb-server-10.3 (<< ${source:Version})
+        mariadb-server-10.3
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
-          mariadb-server-10.3 (<< ${source:Version})
+          mariadb-server-10.3
 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
@@ -625,17 +636,17 @@ Description: Spider storage engine for MariaDB
 
 Package: mariadb-plugin-cassandra
 Architecture: any
-Depends: mariadb-server-10.3 (= ${binary:Version}),
+Depends: mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0,
         mariadb-server-10.1,
         mariadb-server-10.2,
-        mariadb-server-10.3 (<< ${source:Version})
+        mariadb-server-10.3
 Replaces: mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
-          mariadb-server-10.3 (<< ${source:Version})
+          mariadb-server-10.3
 Description: Cassandra storage engine for MariaDB
  The Cassandra Storage Engine allows access to data in a Cassandra cluster from
  MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
@@ -647,7 +658,7 @@ Description: Cassandra storage engine for MariaDB
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-server-10.3,
+         mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1,
@@ -665,7 +676,7 @@ Description: GSSAPI authentication plugin for MariaDB server
 Package: mariadb-plugin-gssapi-client
 Architecture: any
 Depends: libgssapi-krb5-2,
-         mariadb-client-10.3,
+         mariadb-client-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-gssapi-client-10.1,
@@ -686,7 +697,7 @@ Breaks: mariadb-backup-10.1,
         mariadb-backup-10.2
 Replaces: mariadb-backup-10.1,
           mariadb-backup-10.2
-Depends: mariadb-client-core-10.3,
+Depends: mariadb-client-core-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Backup tool for MariaDB server
@@ -699,7 +710,7 @@ Description: Backup tool for MariaDB server
 Package: mariadb-plugin-cracklib-password-check
 Architecture: any
 Depends: libcrack2 (>= 2.9.0),
-         mariadb-server-10.3,
+         mariadb-server-10.4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: CrackLib Password Validation Plugin for MariaDB
@@ -708,8 +719,8 @@ Description: CrackLib Password Validation Plugin for MariaDB
 
 Package: mariadb-test
 Architecture: any
-Depends: mariadb-client-10.3 (= ${binary:Version}),
-         mariadb-server-10.3 (= ${binary:Version}),
+Depends: mariadb-client-10.4 (= ${binary:Version}),
+         mariadb-server-10.4 (= ${binary:Version}),
          mariadb-test-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
@@ -717,6 +728,7 @@ Breaks: mariadb-server-5.5,
         mariadb-test-10.0,
         mariadb-test-10.1,
         mariadb-test-10.2,
+        mariadb-test-10.3,
         mariadb-test-5.5,
         mysql-testsuite,
         mysql-testsuite-5.5,
@@ -727,6 +739,7 @@ Replaces: mariadb-server-5.5,
           mariadb-test-10.0,
           mariadb-test-10.1,
           mariadb-test-10.2,
+          mariadb-test-10.3,
           mariadb-test-5.5,
           mysql-testsuite,
           mysql-testsuite-5.5,