From 0a1dbe842657c7617f59770273c8004a034d312c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@seravo.fi>
Date: Sun, 10 Jul 2016 23:36:05 +0300
Subject: [PATCH] MDEV-6284: Split mariadb-test-data out of mariadb-test

---
 debian/control                   | 28 ++++++++++++++++++++
 debian/mariadb-test-data.install | 16 ++++++++++++
 debian/mariadb-test.install      | 45 ++++++++++++++++++--------------
 debian/mariadb-test.manpages     |  4 +++
 4 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 debian/mariadb-test-data.install
 create mode 100644 debian/mariadb-test.manpages

diff --git a/debian/control b/debian/control
index 914d12b93ba..ef195a1ad4f 100644
--- a/debian/control
+++ b/debian/control
@@ -381,6 +381,7 @@ 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-test-10.1,
@@ -409,6 +410,33 @@ Description: MariaDB database regression test suite
  .
  This package includes the regression test suite.
 
+Package: mariadb-test-data
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: mariadb-test-10.1,
+       mariadb-test-10.0,
+       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.1,
+         mariadb-test-10.0,
+         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-connect-engine-10.2
 Architecture: any
 Depends: libxml2,
diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install
new file mode 100644
index 00000000000..84d01dc31f1
--- /dev/null
+++ b/debian/mariadb-test-data.install
@@ -0,0 +1,16 @@
+usr/share/mysql/mysql-test/collections
+usr/share/mysql/mysql-test/extra
+usr/share/mysql/mysql-test/include
+usr/share/mysql/mysql-test/lib
+usr/share/mysql/mysql-test/mysql-test-run.pl
+usr/share/mysql/mysql-test/disabled.def
+usr/share/mysql/mysql-test/valgrind.supp
+usr/share/mysql/mysql-test/mysql-stress-test.pl
+usr/share/mysql/mysql-test/README
+usr/share/mysql/mysql-test/README.stress
+usr/share/mysql/mysql-test/unstable-tests
+usr/share/mysql/mysql-test/plugin
+usr/share/mysql/mysql-test/r
+usr/share/mysql/mysql-test/std_data
+usr/share/mysql/mysql-test/suite
+usr/share/mysql/mysql-test/t
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index dbb551a9407..873cd07cc92 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -1,23 +1,28 @@
-usr/lib/mysql/plugin/debug_key_management.so
-usr/lib/mysql/plugin/example_key_management.so
-usr/lib/mysql/plugin/dialog_examples.so
-usr/lib/mysql/plugin/auth_test_plugin.so
-usr/lib/mysql/plugin/qa_auth_interface.so
-usr/lib/mysql/plugin/qa_auth_server.so
-usr/lib/mysql/plugin/qa_auth_client.so
-usr/lib/mysql/plugin/auth_0x0100.so
-usr/lib/mysql/plugin/mypluglib.so
-usr/lib/mysql/plugin/ha_test_sql_discovery.so
-usr/lib/mysql/plugin/ha_example.so
-usr/lib/mysql/plugin/daemon_example.ini
-usr/lib/mysql/plugin/libdaemon_example.so
-usr/lib/mysql/plugin/adt_null.so
 usr/bin/mysql_client_test
 usr/bin/mysql_client_test_embedded
-usr/bin/mysqltest_embedded
-usr/share/man/man1/mysql_client_test.1
-usr/share/man/man1/mysql_client_test_embedded.1
 usr/bin/mysqltest
-usr/share/man/man1/mysqltest.1
-usr/share/man/man1/mysqltest_embedded.1
-usr/share/mysql/mysql-test
+usr/bin/mysqltest_embedded
+usr/lib/mysql/plugin/adt_null.so
+usr/lib/mysql/plugin/auth_0x0100.so
+usr/lib/mysql/plugin/auth_test_plugin.so
+usr/lib/mysql/plugin/daemon_example.ini
+usr/lib/mysql/plugin/dialog_examples.so
+usr/lib/mysql/plugin/debug_key_management.so
+usr/lib/mysql/plugin/example_key_management.so
+usr/lib/mysql/plugin/ha_example.so
+usr/lib/mysql/plugin/ha_test_sql_discovery.so
+usr/lib/mysql/plugin/libdaemon_example.so
+usr/lib/mysql/plugin/mypluglib.so
+usr/lib/mysql/plugin/qa_auth_client.so
+usr/lib/mysql/plugin/qa_auth_interface.so
+usr/lib/mysql/plugin/qa_auth_server.so
+usr/share/mysql/mysql-test/README
+usr/share/mysql/mysql-test/README.gcov
+usr/share/mysql/mysql-test/README.stress
+usr/share/mysql/mysql-test/disabled.def
+usr/share/mysql/mysql-test/lib
+usr/share/mysql/mysql-test/mysql-stress-test.pl
+usr/share/mysql/mysql-test/mysql-test-run.pl
+usr/share/mysql/mysql-test/purify.supp
+usr/share/mysql/mysql-test/suite.pm
+usr/share/mysql/mysql-test/valgrind.supp
diff --git a/debian/mariadb-test.manpages b/debian/mariadb-test.manpages
new file mode 100644
index 00000000000..33ce8710ea7
--- /dev/null
+++ b/debian/mariadb-test.manpages
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/man/man1/mysql_client_test.1
+debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1
+debian/tmp/usr/share/man/man1/mysqltest.1
+debian/tmp/usr/share/man/man1/mysqltest_embedded.1