MDEV-6284: Make mariadb-test package versionless

There is no need for a separate mariadb-test metapackage and a versioned
mariadb-test-* package. Simply make it versionless and make it depend on
the client and server packages that stem from same source version.

4 files changed, 30 insertions, 118 deletions

diff --git a/debian/control b/debian/control
index 588f7d4e0ee..914d12b93ba 100644
--- a/debian/control
+++ b/debian/control
@@ -287,38 +287,6 @@ Description: MariaDB database core server files
  .
  This package includes the core server files, as used by Akonadi.
 
-Package: mariadb-test-10.2
-Architecture: any
-Depends: mariadb-client-10.2 (= ${binary:Version}),
-         mariadb-server-10.2 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: patch
-Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
-           mariadb-server-5.5 (<< 5.5.33),
-           mariadb-test (<< ${source:Version}),
-           mariadb-test-10.0,
-           mariadb-test-10.1,
-           mariadb-test-5.1,
-           mariadb-test-5.2,
-           mariadb-test-5.3,
-           virtual-mysql-testsuite
-Replaces: mariadb-test (<< ${source:Version}),
-          mariadb-test-10.0,
-          mariadb-test-10.1,
-          mariadb-test-5.1,
-          mariadb-test-5.2,
-          mariadb-test-5.3,
-          virtual-mysql-testsuite
-Provides: virtual-mysql-testsuite
-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-server-10.2
 Architecture: any
 Suggests: mailx, mariadb-test, netcat-openbsd, tinyca
@@ -410,12 +378,36 @@ Description: MariaDB database client (metapackage depending on the latest versio
  you want, as this is the one considered to be in the best shape.
 
 Package: mariadb-test
-Architecture: all
-Depends: mariadb-test-10.2 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database regression test suite (metapackage for the latest version)
- This is an empty package that depends on the current "best" version of
- mariadb-test (currently mariadb-test-10.2), as determined by the MariaDB
- maintainers.
+Architecture: any
+Depends: mariadb-client-10.2 (= ${binary:Version}),
+        mariadb-server-10.2 (= ${binary:Version}),
+        ${misc:Depends},
+        ${shlibs:Depends}
+Breaks: mariadb-test-10.1,
+       mariadb-test-10.0,
+       mariadb-test-5.5,
+       mysql-testsuite,
+       mysql-testsuite-5.5,
+       mysql-testsuite-5.6,
+       mysql-testsuite-5.7,
+       virtual-mysql-testsuite
+Replaces: mariadb-test-10.1,
+         mariadb-test-10.0,
+         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-connect-engine-10.2
 Architecture: any
diff --git a/debian/mariadb-test-10.2.dirs b/debian/mariadb-test-10.2.dirs
deleted file mode 100644
index b21c5b780f7..00000000000
--- a/debian/mariadb-test-10.2.dirs
+++ /dev/null
@@ -1,80 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/mysql/mysql-test
-usr/share/mysql/mysql-test/extra
-usr/share/mysql/mysql-test/extra/binlog_tests
-usr/share/mysql/mysql-test/extra/rpl_tests
-usr/share/mysql/mysql-test/lib
-usr/share/mysql/mysql-test/lib/My
-usr/share/mysql/mysql-test/lib/My/SafeProcess
-usr/share/mysql/mysql-test/lib/My/File
-usr/share/mysql/mysql-test/lib/v1
-usr/share/mysql/mysql-test/lib/v1/My
-usr/share/mysql/mysql-test/collections
-usr/share/mysql/mysql-test/t
-usr/share/mysql/mysql-test/r
-usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/suite
-usr/share/mysql/mysql-test/suite/parts
-usr/share/mysql/mysql-test/suite/parts/inc
-usr/share/mysql/mysql-test/suite/parts/t
-usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/bugs
-usr/share/mysql/mysql-test/suite/bugs/t
-usr/share/mysql/mysql-test/suite/bugs/r
-usr/share/mysql/mysql-test/suite/bugs/data
-usr/share/mysql/mysql-test/suite/rpl
-usr/share/mysql/mysql-test/suite/rpl/t
-usr/share/mysql/mysql-test/suite/rpl/r
-usr/share/mysql/mysql-test/suite/rpl/include
-usr/share/mysql/mysql-test/suite/innodb
-usr/share/mysql/mysql-test/suite/innodb/t
-usr/share/mysql/mysql-test/suite/innodb/r
-usr/share/mysql/mysql-test/suite/innodb/include
-usr/share/mysql/mysql-test/suite/manual
-usr/share/mysql/mysql-test/suite/manual/t
-usr/share/mysql/mysql-test/suite/manual/r
-usr/share/mysql/mysql-test/suite/stress
-usr/share/mysql/mysql-test/suite/stress/t
-usr/share/mysql/mysql-test/suite/stress/r
-usr/share/mysql/mysql-test/suite/stress/include
-usr/share/mysql/mysql-test/suite/jp
-usr/share/mysql/mysql-test/suite/jp/t
-usr/share/mysql/mysql-test/suite/jp/r
-usr/share/mysql/mysql-test/suite/jp/include
-usr/share/mysql/mysql-test/suite/jp/std_data
-usr/share/mysql/mysql-test/suite/maria
-usr/share/mysql/mysql-test/suite/funcs_2
-usr/share/mysql/mysql-test/suite/funcs_2/lib
-usr/share/mysql/mysql-test/suite/funcs_2/t
-usr/share/mysql/mysql-test/suite/funcs_2/charset
-usr/share/mysql/mysql-test/suite/funcs_2/r
-usr/share/mysql/mysql-test/suite/funcs_2/include
-usr/share/mysql/mysql-test/suite/funcs_2/data
-usr/share/mysql/mysql-test/suite/binlog
-usr/share/mysql/mysql-test/suite/binlog/t
-usr/share/mysql/mysql-test/suite/binlog/r
-usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/federated
-usr/share/mysql/mysql-test/suite/funcs_1
-usr/share/mysql/mysql-test/suite/funcs_1/cursors
-usr/share/mysql/mysql-test/suite/funcs_1/bitdata
-usr/share/mysql/mysql-test/suite/funcs_1/views
-usr/share/mysql/mysql-test/suite/funcs_1/storedproc
-usr/share/mysql/mysql-test/suite/funcs_1/triggers
-usr/share/mysql/mysql-test/suite/funcs_1/lib
-usr/share/mysql/mysql-test/suite/funcs_1/t
-usr/share/mysql/mysql-test/suite/funcs_1/r
-usr/share/mysql/mysql-test/suite/funcs_1/include
-usr/share/mysql/mysql-test/suite/funcs_1/datadict
-usr/share/mysql/mysql-test/suite/vcol
-usr/share/mysql/mysql-test/suite/vcol/inc
-usr/share/mysql/mysql-test/suite/vcol/t
-usr/share/mysql/mysql-test/suite/vcol/r
-usr/share/mysql/mysql-test/suite/oqgraph
-usr/share/mysql/mysql-test/suite/oqgraph/t
-usr/share/mysql/mysql-test/suite/oqgraph/r
-usr/share/mysql/mysql-test/suite/oqgraph/include
-usr/share/mysql/mysql-test/std_data
-usr/share/mysql/mysql-test/std_data/parts
-usr/share/mysql/mysql-test/std_data/funcs_1
diff --git a/debian/mariadb-test-10.2.install b/debian/mariadb-test.install
index dbb551a9407..dbb551a9407 100644
--- a/debian/mariadb-test-10.2.install
+++ b/debian/mariadb-test.install
diff --git a/debian/mariadb-test-10.2.links b/debian/mariadb-test.links
index 082680fe5ed..082680fe5ed 100644
--- a/debian/mariadb-test-10.2.links
+++ b/debian/mariadb-test.links