Debian script fixes.

35 files changed, 300 insertions, 57 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 50b216aae7c..021246d51f5 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -167,7 +167,7 @@ Description: MariaDB database core server files
 Package: mariadb-test-5.5
 Section: database
 Architecture: any
-Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
+Depends: mariadb-galera-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
     mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
@@ -193,7 +193,7 @@ Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Vers
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
     mariadb-tokudb-engine-5.5
-Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), 
+Replaces: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}),
     mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5,
     mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3,
     libmariadbclient16 (<< 5.3.4), libmariadbclient-dev (<< 5.5.0),
@@ -221,3 +221,23 @@ Description: MariaDB database server with Galera cluster (metapackage depending
  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.
+
+Package: mariadb-client
+Section: database
+Architecture: all
+Depends: mariadb-client-5.5 (= ${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-5.5), as determined by the MariaDB
+ maintainers.  Install this package if in doubt about which MariaDB version
+ you want, as this is the one we consider to be in the best shape.
+
+Package: mariadb-test
+Section: database
+Architecture: all
+Depends: mariadb-test-5.5 (= ${source:Version})
+Description: MariaDB database regression test suite (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
+ maintainers.
+
diff --git a/debian/dist/Debian/mariadb-galera-server-5.5.dirs b/debian/dist/Debian/mariadb-galera-server-5.5.dirs
index 0e3b2ce5af8..39fa440b07f 100644
--- a/debian/dist/Debian/mariadb-galera-server-5.5.dirs
+++ b/debian/dist/Debian/mariadb-galera-server-5.5.dirs
@@ -6,6 +6,5 @@ usr/sbin
 usr/share/man/man8
 usr/share/mysql
 usr/share/doc/mariadb-galera-server-5.5
-usr/support-files
 var/run/mysqld
 var/lib/mysql-upgrade
diff --git a/debian/dist/Debian/mariadb-galera-server-5.5.files.in b/debian/dist/Debian/mariadb-galera-server-5.5.files.in
index fba6d8b2208..ed1ca3f71b9 100644
--- a/debian/dist/Debian/mariadb-galera-server-5.5.files.in
+++ b/debian/dist/Debian/mariadb-galera-server-5.5.files.in
@@ -1,4 +1,3 @@
-usr/sbin/mysqld
 usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/sphinx.so
@@ -69,31 +68,6 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man8/mysqld.8
-usr/share/mysql/charsets
-usr/share/mysql/czech
-usr/share/mysql/danish
-usr/share/mysql/dutch
-usr/share/mysql/english
-usr/share/mysql/estonian
-usr/share/mysql/french
-usr/share/mysql/german
-usr/share/mysql/greek
-usr/share/mysql/hungarian
-usr/share/mysql/italian
-usr/share/mysql/japanese
-usr/share/mysql/korean
-usr/share/mysql/norwegian
-usr/share/mysql/norwegian-ny
-usr/share/mysql/polish
-usr/share/mysql/portuguese
-usr/share/mysql/romanian
-usr/share/mysql/russian
-usr/share/mysql/serbian
-usr/share/mysql/slovak
-usr/share/mysql/spanish
-usr/share/mysql/swedish
-usr/share/mysql/ukrainian
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 2d3db49356f..ae22fdbfcc4 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -190,7 +190,9 @@ install: build
 
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
+	cp debian/mysql-common.lintian-overrides      $(TMP)/usr/share/lintian/overrides/mysql-common
 	cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-5.5
+	cp debian/mariadb-client-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-5.5
 
 	# For 5.0 -> 5.5 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index f6a1e492008..5b76594f0e1 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -161,7 +161,7 @@ Description: MariaDB database core server files
 Package: mariadb-test-5.5
 Section: database
 Architecture: any
-Depends: mariadb-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
+Depends: mariadb-galera-server-5.5 (= ${source:Version}), mariadb-client-5.5 (= ${source:Version})
 Suggests: patch
 Conflicts: mariadb-test (<< ${source:Version}),
     mariadb-test-5.1, mariadb-test-5.2, mariadb-test-5.3,
@@ -215,3 +215,23 @@ Description: MariaDB database server with Galera cluster (metapackage depending
  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.
+
+Package: mariadb-client
+Section: database
+Architecture: all
+Depends: mariadb-client-5.5 (= ${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-5.5), as determined by the MariaDB
+ maintainers.  Install this package if in doubt about which MariaDB version
+ you want, as this is the one we consider to be in the best shape.
+
+Package: mariadb-test
+Section: database
+Architecture: all
+Depends: mariadb-test-5.5 (= ${source:Version})
+Description: MariaDB database regression test suite (metapackage depending on the latest version)
+ This is an empty package that depends on the current "best" version of
+ mariadb-test (currently mariadb-test-5.5), as determined by the MariaDB
+ maintainers.
+
diff --git a/debian/dist/Ubuntu/mariadb-galera-server-5.5.dirs b/debian/dist/Ubuntu/mariadb-galera-server-5.5.dirs
index 0e3b2ce5af8..39fa440b07f 100644
--- a/debian/dist/Ubuntu/mariadb-galera-server-5.5.dirs
+++ b/debian/dist/Ubuntu/mariadb-galera-server-5.5.dirs
@@ -6,6 +6,5 @@ usr/sbin
 usr/share/man/man8
 usr/share/mysql
 usr/share/doc/mariadb-galera-server-5.5
-usr/support-files
 var/run/mysqld
 var/lib/mysql-upgrade
diff --git a/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in b/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
index acf5acb036f..9ef18c4c0f2 100644
--- a/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
+++ b/debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in
@@ -1,4 +1,3 @@
-usr/sbin/mysqld
 usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/sphinx.so
@@ -71,31 +70,6 @@ usr/share/man/man1/resolveip.1
 usr/share/man/man1/resolve_stack_dump.1
 usr/share/man/man1/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
-usr/share/man/man8/mysqld.8
-usr/share/mysql/charsets
-usr/share/mysql/czech
-usr/share/mysql/danish
-usr/share/mysql/dutch
-usr/share/mysql/english
-usr/share/mysql/estonian
-usr/share/mysql/french
-usr/share/mysql/german
-usr/share/mysql/greek
-usr/share/mysql/hungarian
-usr/share/mysql/italian
-usr/share/mysql/japanese
-usr/share/mysql/korean
-usr/share/mysql/norwegian
-usr/share/mysql/norwegian-ny
-usr/share/mysql/polish
-usr/share/mysql/portuguese
-usr/share/mysql/romanian
-usr/share/mysql/russian
-usr/share/mysql/serbian
-usr/share/mysql/slovak
-usr/share/mysql/spanish
-usr/share/mysql/swedish
-usr/share/mysql/ukrainian
 usr/share/mysql/debian-start.inc.sh
 usr/share/mysql/echo_stderr
 usr/share/mysql/errmsg-utf8.txt
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 5e9609b6c8c..9b214e5422a 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -190,7 +190,9 @@ install: build
 
 	# lintian overrides
 	mkdir -p $(TMP)/usr/share/lintian/overrides/
+	cp debian/mysql-common.lintian-overrides      $(TMP)/usr/share/lintian/overrides/mysql-common
 	cp debian/mariadb-galera-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-5.5
+	cp debian/mariadb-client-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-5.5
 
 	# For 5.0 -> 5.5 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
diff --git a/debian/libmariadbclient-dev.README.Maintainer b/debian/libmariadbclient-dev.README.Maintainer
new file mode 100644
index 00000000000..f24cdcd519d
--- /dev/null
+++ b/debian/libmariadbclient-dev.README.Maintainer
@@ -0,0 +1,4 @@
+The examples directory includes files that might be needed by some
+developers:
+- header files not installed by default
+- the example file udf_example.c
diff --git a/debian/libmariadbclient-dev.dirs b/debian/libmariadbclient-dev.dirs
new file mode 100644
index 00000000000..f6ad2870431
--- /dev/null
+++ b/debian/libmariadbclient-dev.dirs
@@ -0,0 +1,2 @@
+usr/include/
+usr/lib/
diff --git a/debian/libmariadbclient-dev.examples b/debian/libmariadbclient-dev.examples
new file mode 100644
index 00000000000..f1649c311c4
--- /dev/null
+++ b/debian/libmariadbclient-dev.examples
@@ -0,0 +1 @@
+sql/udf_example.c
diff --git a/debian/libmariadbclient-dev.files b/debian/libmariadbclient-dev.files
new file mode 100644
index 00000000000..8f56a3065d5
--- /dev/null
+++ b/debian/libmariadbclient-dev.files
@@ -0,0 +1,7 @@
+usr/bin/mysql_config
+usr/include/mysql
+usr/lib/libmysqlclient.a
+usr/lib/libmysqlclient_r.a
+usr/lib/libmysqlservices.a
+usr/share/aclocal/mysql.m4
+usr/share/man/man1/mysql_config.1
diff --git a/debian/libmariadbclient-dev.links b/debian/libmariadbclient-dev.links
new file mode 100644
index 00000000000..0076791dcfa
--- /dev/null
+++ b/debian/libmariadbclient-dev.links
@@ -0,0 +1,2 @@
+usr/lib/libmysqlclient.so.18	usr/lib/libmysqlclient.so
+usr/lib/libmysqlclient_r.so.18	usr/lib/libmysqlclient_r.so
diff --git a/debian/libmariadbclient18.dirs b/debian/libmariadbclient18.dirs
new file mode 100644
index 00000000000..2964de6141b
--- /dev/null
+++ b/debian/libmariadbclient18.dirs
@@ -0,0 +1 @@
+usr/lib/
diff --git a/debian/libmariadbclient18.files b/debian/libmariadbclient18.files
new file mode 100644
index 00000000000..75020ecbd16
--- /dev/null
+++ b/debian/libmariadbclient18.files
@@ -0,0 +1,3 @@
+usr/lib/libmysqlclient*.so.*
+usr/lib/mysql/plugin/mysql_clear_password.so
+usr/lib/mysql/plugin/dialog.so
diff --git a/debian/libmariadbclient18.postinst b/debian/libmariadbclient18.postinst
new file mode 100644
index 00000000000..29d3b86f978
--- /dev/null
+++ b/debian/libmariadbclient18.postinst
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+# vim: ts=4
+
+
diff --git a/debian/libmariadbd-dev.files b/debian/libmariadbd-dev.files
new file mode 100644
index 00000000000..26cb8d0a606
--- /dev/null
+++ b/debian/libmariadbd-dev.files
@@ -0,0 +1,2 @@
+usr/lib/mysql/*.a
+usr/lib/mysql/*.la
diff --git a/debian/mariadb-client-5.5.README.Debian b/debian/mariadb-client-5.5.README.Debian
new file mode 100644
index 00000000000..b245638f9c9
--- /dev/null
+++ b/debian/mariadb-client-5.5.README.Debian
@@ -0,0 +1,4 @@
+FAQ:
+
+Q: My <tab> completition is gone, why?
+A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!
diff --git a/debian/mariadb-client-5.5.dirs b/debian/mariadb-client-5.5.dirs
new file mode 100644
index 00000000000..ceda5922c5d
--- /dev/null
+++ b/debian/mariadb-client-5.5.dirs
@@ -0,0 +1,3 @@
+usr/bin/
+usr/share/man/man1/
+usr/share/perl5/
diff --git a/debian/mariadb-client-5.5.docs b/debian/mariadb-client-5.5.docs
new file mode 100644
index 00000000000..21446855f51
--- /dev/null
+++ b/debian/mariadb-client-5.5.docs
@@ -0,0 +1,2 @@
+debian/additions/innotop/changelog.innotop
+README
diff --git a/debian/mariadb-client-5.5.files b/debian/mariadb-client-5.5.files
new file mode 100644
index 00000000000..9cb949ea53e
--- /dev/null
+++ b/debian/mariadb-client-5.5.files
@@ -0,0 +1,31 @@
+usr/bin/innochecksum
+usr/bin/innotop
+usr/bin/mysqlaccess
+usr/bin/mysqladmin
+usr/bin/mysqlbug
+usr/bin/mysqldump
+usr/bin/mysqldumpslow
+usr/bin/mysql_find_rows
+usr/bin/mysql_fix_extensions
+usr/bin/mysqlimport
+usr/bin/mysqlreport
+usr/bin/mysqlshow
+usr/bin/mysqlslap
+usr/bin/mysql_waitpid
+usr/share/lintian/overrides/mariadb-client-5.5
+usr/share/man/man1/innotop.1
+usr/share/man/man1/mysqlaccess.1
+usr/share/man/man1/mysqladmin.1
+usr/share/man/man1/mysqlbug.1
+usr/share/man/man1/mysqldump.1
+usr/share/man/man1/mysqldumpslow.1
+usr/share/man/man1/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlman.1
+usr/share/man/man1/mysqlreport.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_tableinfo.1
+usr/share/man/man1/mysql_waitpid.1
+usr/share/man/man8/mysqlmanager.8
diff --git a/debian/mariadb-client-5.5.links b/debian/mariadb-client-5.5.links
new file mode 100644
index 00000000000..247369fa218
--- /dev/null
+++ b/debian/mariadb-client-5.5.links
@@ -0,0 +1,3 @@
+usr/bin/mysqlcheck usr/bin/mysqlrepair
+usr/bin/mysqlcheck usr/bin/mysqlanalyze
+usr/bin/mysqlcheck usr/bin/mysqloptimize
diff --git a/debian/mariadb-client-5.5.lintian-overrides b/debian/mariadb-client-5.5.lintian-overrides
new file mode 100644
index 00000000000..d4dc1a70b1e
--- /dev/null
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -0,0 +1,3 @@
+mariadb-client-5.3: package-has-a-duplicate-relation
+mariadb-client-5.3: wrong-name-for-upstream-changelog usr/share/doc/mariadb-client-5.3/changelog.innotop.gz
+mariadb-client-5.3: pkg-not-in-package-test innotop
diff --git a/debian/mariadb-client-5.5.menu b/debian/mariadb-client-5.5.menu
new file mode 100644
index 00000000000..1378555c423
--- /dev/null
+++ b/debian/mariadb-client-5.5.menu
@@ -0,0 +1,3 @@
+# According to /usr/share/menu/ policy 1.4, not /usr/share/doc/debian-policy/
+?package(innotop):needs="text" section="Applications/Data Management"\
+  title="innotop" command="/usr/bin/innotop"
diff --git a/debian/mariadb-client-core-5.5.files b/debian/mariadb-client-core-5.5.files
new file mode 100644
index 00000000000..a2781309439
--- /dev/null
+++ b/debian/mariadb-client-core-5.5.files
@@ -0,0 +1,4 @@
+usr/bin/mysql
+usr/bin/mysqlcheck
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-common.files b/debian/mariadb-common.files
new file mode 100644
index 00000000000..f37e46c45fe
--- /dev/null
+++ b/debian/mariadb-common.files
@@ -0,0 +1 @@
+etc/mysql/conf.d/mariadb.cnf
diff --git a/debian/mariadb-common.postrm b/debian/mariadb-common.postrm
new file mode 100644
index 00000000000..027592f816e
--- /dev/null
+++ b/debian/mariadb-common.postrm
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+if [ "$1" = "purge" ]; then
+  rmdir /etc/mysql/conf.d 2>/dev/null || true
+  rmdir /etc/mysql 2>/dev/null || true
+fi
+
+#DEBHELPER#
diff --git a/debian/mariadb-server-core-5.5.files b/debian/mariadb-server-core-5.5.files
new file mode 100644
index 00000000000..5c60ca5ec67
--- /dev/null
+++ b/debian/mariadb-server-core-5.5.files
@@ -0,0 +1,26 @@
+usr/sbin/mysqld
+usr/share/man/man8/mysqld.8
+usr/share/mysql/charsets
+usr/share/mysql/czech
+usr/share/mysql/danish
+usr/share/mysql/dutch
+usr/share/mysql/english
+usr/share/mysql/estonian
+usr/share/mysql/french
+usr/share/mysql/german
+usr/share/mysql/greek
+usr/share/mysql/hungarian
+usr/share/mysql/italian
+usr/share/mysql/japanese
+usr/share/mysql/korean
+usr/share/mysql/norwegian
+usr/share/mysql/norwegian-ny
+usr/share/mysql/polish
+usr/share/mysql/portuguese
+usr/share/mysql/romanian
+usr/share/mysql/russian
+usr/share/mysql/serbian
+usr/share/mysql/slovak
+usr/share/mysql/spanish
+usr/share/mysql/swedish
+usr/share/mysql/ukrainian
diff --git a/debian/mariadb-test-5.5.dirs b/debian/mariadb-test-5.5.dirs
new file mode 100644
index 00000000000..2ab1fb61def
--- /dev/null
+++ b/debian/mariadb-test-5.5.dirs
@@ -0,0 +1,101 @@
+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/rpl_ndb
+usr/share/mysql/mysql-test/suite/rpl_ndb/t
+usr/share/mysql/mysql-test/suite/rpl_ndb/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/ndb
+usr/share/mysql/mysql-test/suite/ndb/t
+usr/share/mysql/mysql-test/suite/ndb/r
+usr/share/mysql/mysql-test/suite/maria
+usr/share/mysql/mysql-test/suite/maria/t
+usr/share/mysql/mysql-test/suite/maria/r
+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/ndb_team
+usr/share/mysql/mysql-test/suite/ndb_team/t
+usr/share/mysql/mysql-test/suite/ndb_team/r
+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/suite/galera
+usr/share/mysql/mysql-test/suite/galera/t
+usr/share/mysql/mysql-test/suite/galera/r
+usr/share/mysql/mysql-test/suite/wsrep
+usr/share/mysql/mysql-test/suite/wsrep/t
+usr/share/mysql/mysql-test/suite/wsrep/r
+usr/share/mysql/mysql-test/std_data
+usr/share/mysql/mysql-test/std_data/ndb_backup50
+usr/share/mysql/mysql-test/std_data/parts
+usr/share/mysql/mysql-test/std_data/ndb_backup51_data_le
+usr/share/mysql/mysql-test/std_data/ndb_backup51_data_be
+usr/share/mysql/mysql-test/std_data/ndb_backup51
+usr/share/mysql/mysql-test/std_data/funcs_1
diff --git a/debian/mariadb-test-5.5.files b/debian/mariadb-test-5.5.files
new file mode 100644
index 00000000000..79eb9520607
--- /dev/null
+++ b/debian/mariadb-test-5.5.files
@@ -0,0 +1,15 @@
+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/daemon_example.ini
+usr/lib/mysql/plugin/libdaemon_example.so
+usr/lib/mysql/plugin/adt_null.so
+usr/bin/mysql_client_test
+usr/share/man/man1/mysql_client_test.1
+usr/bin/mysqltest
+usr/share/man/man1/mysqltest.1
+usr/share/mysql/mysql-test
diff --git a/debian/mariadb-test-5.5.links b/debian/mariadb-test-5.5.links
new file mode 100644
index 00000000000..082680fe5ed
--- /dev/null
+++ b/debian/mariadb-test-5.5.links
@@ -0,0 +1,2 @@
+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run
+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
diff --git a/debian/mysql-common.dirs b/debian/mysql-common.dirs
new file mode 100644
index 00000000000..a5a88ede9c1
--- /dev/null
+++ b/debian/mysql-common.dirs
@@ -0,0 +1 @@
+etc/mysql/conf.d/
diff --git a/debian/mysql-common.files b/debian/mysql-common.files
new file mode 100644
index 00000000000..d167569e892
--- /dev/null
+++ b/debian/mysql-common.files
@@ -0,0 +1,3 @@
+etc/mysql/my.cnf
+usr/share/mysql-common/internal-use-only
+usr/share/lintian/overrides/mysql-common
diff --git a/debian/mysql-common.lintian-overrides b/debian/mysql-common.lintian-overrides
new file mode 100644
index 00000000000..c6c60ccdc71
--- /dev/null
+++ b/debian/mysql-common.lintian-overrides
@@ -0,0 +1,2 @@
+script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_init.d_mysql
+script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_mysql_debian-start
diff --git a/debian/mysql-common.postrm b/debian/mysql-common.postrm
new file mode 100644
index 00000000000..0d3f8aed83d
--- /dev/null
+++ b/debian/mysql-common.postrm
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+if [ "$1" = "purge" ]; then
+  rmdir /etc/mysql 2>/dev/null || true
+fi
+
+#DEBHELPER#