fix debian builds

debian/dist/Debian/control

@@ -42,8 +42,7 @@ Package: mariadb-galera-server
 Section: database
 Architecture: all
 Depends: mariadb-galera-server-5.5 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database server with Galera cluster
- (metapackage depending on the latest version)
+Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
  mariadb-galera-server (currently mariadb-galera-server-5.5), as determined by the MariaDB
  maintainers. Install this package if in doubt about which MariaDB-Galera
@@ -54,22 +53,3 @@ Description: MariaDB database server with Galera cluster
  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.

debian/dist/Debian/mariadb-galera-server-5.5.files

-usr/sbin/mysqld
-usr/lib/mysql/plugin/ha_innodb.so
-usr/lib/mysql/plugin/ha_oqgraph.so
-usr/lib/mysql/plugin/sphinx.so
-usr/lib/mysql/plugin/auth_socket.so
-usr/lib/mysql/plugin/auth_pam.so
-usr/lib/mysql/plugin/semisync_master.so
-usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/handlersocket.so
-usr/lib/mysql/plugin/sql_errlog.so
-usr/lib/libhsclient.so.*
-etc/mysql/debian-start
-etc/mysql/conf.d/mysqld_safe_syslog.cnf
-usr/bin/msql2mysql
-usr/bin/my_print_defaults
-usr/bin/myisamchk
-usr/bin/myisam_ftdump
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/aria_pack
-usr/bin/aria_read_log
-usr/bin/aria_ftdump
-usr/bin/aria_chk
-usr/bin/aria_dump_log
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_install_db
-usr/bin/mysql_plugin
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
-usr/bin/mysql_zap
-usr/bin/mysqlbinlog
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqlhotcopy
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
-usr/bin/wsrep_sst_common
-usr/bin/wsrep_sst_mysqldump
-usr/bin/wsrep_sst_rsync
-usr/bin/wsrep_sst_xtrabackup
-usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
-usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
-usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
-usr/share/doc/mariadb-galera-server-5.5/README-wsrep
-usr/share/lintian/overrides/mariadb-galera-server-5.5
-usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/myisamchk.1
-usr/share/man/man1/myisam_ftdump.1
-usr/share/man/man1/myisamlog.1
-usr/share/man/man1/myisampack.1
-usr/share/man/man1/my_print_defaults.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqlhotcopy.1
-usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man1/mysql_zap.1
-usr/share/man/man1/perror.1
-usr/share/man/man1/replace.1
-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
-usr/share/mysql/fill_help_tables.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/mysql_system_tables.sql
-usr/share/mysql/mysql_performance_tables.sql
-usr/share/mysql/mysql_test_data_timezone.sql
-@TOKUDB_DEB_FILES@
-usr/share/mysql/wsrep.cnf
-usr/share/mysql/wsrep_notify

debian/dist/Debian/mariadb-galera-server-5.5.files.in

+usr/sbin/mysqld
 usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/sphinx.so
@@ -37,9 +38,14 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mysqldump
+usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_xtrabackup
 usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
 usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
 usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
+usr/share/doc/mariadb-galera-server-5.5/README-wsrep
 usr/share/lintian/overrides/mariadb-galera-server-5.5
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
@@ -63,6 +69,31 @@ 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
@@ -72,3 +103,5 @@ usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 @TOKUDB_DEB_FILES@
+usr/share/mysql/wsrep.cnf
+usr/share/mysql/wsrep_notify

debian/dist/Ubuntu/control

@@ -42,10 +42,10 @@ Package: mariadb-galera-server
 Section: database
 Architecture: all
 Depends: mariadb-galera-server-5.5 (= ${source:Version}), ${misc:Depends}
-Description: MariaDB database with Galera cluster server (metapackage depending on the latest version)
+Description: MariaDB database server with Galera cluster (metapackage depending on the latest version)
  This is an empty package that depends on the current "best" version of
- mariadb-server (currently mariadb-server-5.5), as determined by the MariaDB
- maintainers. Install this package if in doubt about which MariaDB
+ mariadb-galera-server (currently mariadb-galera-server-5.5), as determined by the MariaDB
+ maintainers. Install this package if in doubt about which MariaDB-Galera
  version you need. That will install the version recommended by the
  package maintainers.
  .
@@ -53,22 +53,3 @@ Description: MariaDB database with Galera cluster server (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.

debian/dist/Ubuntu/mariadb-galera-server-5.5.files

-usr/sbin/mysqld
-usr/lib/mysql/plugin/ha_innodb.so
-usr/lib/mysql/plugin/ha_oqgraph.so
-usr/lib/mysql/plugin/sphinx.so
-usr/lib/mysql/plugin/auth_socket.so
-usr/lib/mysql/plugin/auth_pam.so
-usr/lib/mysql/plugin/semisync_master.so
-usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/handlersocket.so
-usr/lib/mysql/plugin/sql_errlog.so
-usr/lib/libhsclient.so.*
-etc/apparmor.d/usr.sbin.mysqld
-usr/share/apport/package-hooks/source_mariadb-5.5.py
-etc/mysql/debian-start
-etc/mysql/conf.d/mysqld_safe_syslog.cnf
-usr/bin/msql2mysql
-usr/bin/my_print_defaults
-usr/bin/myisamchk
-usr/bin/myisam_ftdump
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/aria_pack
-usr/bin/aria_read_log
-usr/bin/aria_ftdump
-usr/bin/aria_chk
-usr/bin/aria_dump_log
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_install_db
-usr/bin/mysql_plugin
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
-usr/bin/mysql_zap
-usr/bin/mysqlbinlog
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqlhotcopy
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
-usr/bin/wsrep_sst_common
-usr/bin/wsrep_sst_mysqldump
-usr/bin/wsrep_sst_rsync
-usr/bin/wsrep_sst_xtrabackup
-usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
-usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
-usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
-usr/share/doc/mariadb-galera-server-5.5/README-wsrep
-usr/share/lintian/overrides/mariadb-galera-server-5.5
-usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/myisamchk.1
-usr/share/man/man1/myisam_ftdump.1
-usr/share/man/man1/myisamlog.1
-usr/share/man/man1/myisampack.1
-usr/share/man/man1/my_print_defaults.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqlhotcopy.1
-usr/share/man/man1/mysql_install_db.1
-usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysql_upgrade.1
-usr/share/man/man1/mysql_zap.1
-usr/share/man/man1/perror.1
-usr/share/man/man1/replace.1
-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
-usr/share/mysql/fill_help_tables.sql
-usr/share/mysql/mysql_system_tables_data.sql
-usr/share/mysql/mysql_system_tables.sql
-usr/share/mysql/mysql_performance_tables.sql
-usr/share/mysql/mysql_test_data_timezone.sql
-@TOKUDB_DEB_FILES@
-usr/share/mysql/wsrep.cnf
-usr/share/mysql/wsrep_notify

debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in

+usr/sbin/mysqld
 usr/lib/mysql/plugin/ha_innodb.so
 usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/sphinx.so
@@ -39,9 +40,14 @@ usr/bin/perror
 usr/bin/replace
 usr/bin/resolve_stack_dump
 usr/bin/resolveip
+usr/bin/wsrep_sst_common
+usr/bin/wsrep_sst_mysqldump
+usr/bin/wsrep_sst_rsync
+usr/bin/wsrep_sst_xtrabackup
 usr/share/doc/mariadb-galera-server-5.5/mysqld.sym.gz
 usr/share/doc/mariadb-galera-server-5.5/INFO_SRC
 usr/share/doc/mariadb-galera-server-5.5/INFO_BIN
+usr/share/doc/mariadb-galera-server-5.5/README-wsrep
 usr/share/lintian/overrides/mariadb-galera-server-5.5
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/myisamchk.1
@@ -65,6 +71,31 @@ 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
@@ -74,3 +105,5 @@ usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 @TOKUDB_DEB_FILES@
+usr/share/mysql/wsrep.cnf
+usr/share/mysql/wsrep_notify