Modified debian scripts to make galera packages

self-contained.

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

+usr/sbin/mysqld
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_sphinx.so
 usr/lib/mysql/plugin/ha_xtradb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so
@@ -10,7 +12,6 @@ usr/lib/mysql/plugin/query_cache_info.so
 usr/lib/mysql/plugin/query_response_time.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/sphinx.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/libhsclient.so.*
 etc/mysql/debian-start
@@ -73,6 +74,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

debian/dist/Debian/rules

@@ -185,9 +185,7 @@ 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-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0
-	cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0
 
 	# For 5.0 -> 10.0 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \

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

+usr/sbin/mysqld
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
 usr/lib/mysql/plugin/ha_sequence.so
+usr/lib/mysql/plugin/ha_sphinx.so
 usr/lib/mysql/plugin/ha_xtradb.so
+usr/lib/mysql/plugin/ha_oqgraph.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so
@@ -9,7 +12,6 @@ usr/lib/mysql/plugin/query_cache_info.so
 usr/lib/mysql/plugin/query_response_time.so
 usr/lib/mysql/plugin/semisync_master.so
 usr/lib/mysql/plugin/semisync_slave.so
-usr/lib/mysql/plugin/sphinx.so
 usr/lib/mysql/plugin/sql_errlog.so
 usr/lib/libhsclient.so.*
 etc/apparmor.d/usr.sbin.mysqld
@@ -74,6 +76,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

debian/dist/Ubuntu/mariadb-galera-server-10.0.py

@@ -20,7 +20,7 @@ def _add_my_conf_files(report, filename):
             continue
 
 def add_info(report):
-    attach_conffiles(report, 'mariadb-server-10.0', conffiles=None)
+    attach_conffiles(report, 'mariadb-galera-server-10.0', conffiles=None)
     key = 'Logs' + path_to_key('/var/log/daemon.log')
     report[key] = ""
     for line in read_file('/var/log/daemon.log').split('\n'):

debian/dist/Ubuntu/rules

@@ -185,9 +185,7 @@ 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-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-galera-server-10.0
-	cp debian/mariadb-client-10.0.lintian-overrides $(TMP)/usr/share/lintian/overrides/mariadb-client-10.0
 
 	# For 5.0 -> 10.0 transition
 	d=$(TMP)/usr/share/mysql-common/internal-use-only/; \

debian/libmariadbclient-dev.README.Maintainer

-The examples directory includes files that might be needed by some
-developers:
-- header files not installed by default
-- the example file udf_example.c

debian/libmariadbclient-dev.dirs

-usr/include/
-usr/lib/

debian/libmariadbclient-dev.examples

-sql/udf_example.c

debian/libmariadbclient-dev.files

-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

debian/libmariadbclient-dev.links

-usr/lib/libmysqlclient.so.18	usr/lib/libmysqlclient.so
-usr/lib/libmysqlclient_r.so.18	usr/lib/libmysqlclient_r.so

debian/libmariadbclient18.dirs

-usr/lib/

debian/libmariadbclient18.files

-usr/lib/libmysqlclient*.so.*
-usr/lib/mysql/plugin/mysql_clear_password.so
-usr/lib/mysql/plugin/dialog.so

debian/libmariadbclient18.postinst

-#!/bin/bash -e
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-# vim: ts=4
-
-

debian/libmariadbd-dev.files

-usr/lib/mysql/*.a
-usr/lib/mysql/*.la

debian/mariadb-client-10.0.README.Debian

-FAQ:
-
-Q: My <tab> completition is gone, why?
-A: You have "no-auto-rehash" in the "[mysql]" section of /etc/mysql/my.cnf!

debian/mariadb-client-10.0.dirs

-usr/bin/
-usr/share/man/man1/
-usr/share/perl5/

debian/mariadb-client-10.0.docs

-debian/additions/innotop/changelog.innotop
-README

debian/mariadb-client-10.0.files

-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-10.0
-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

debian/mariadb-client-10.0.links

-usr/bin/mysqlcheck usr/bin/mysqlrepair
-usr/bin/mysqlcheck usr/bin/mysqlanalyze
-usr/bin/mysqlcheck usr/bin/mysqloptimize

debian/mariadb-client-10.0.lintian-overrides

-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

debian/mariadb-client-10.0.menu

-# 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"

debian/mariadb-client-core-10.0.files

-usr/bin/mysql
-usr/bin/mysqlcheck
-usr/share/man/man1/mysql.1
-usr/share/man/man1/mysqlcheck.1

debian/mariadb-common.files

-etc/mysql/conf.d/mariadb.cnf

debian/mariadb-common.postrm

-#!/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#

debian/mariadb-connect-engine-10.0.files

-usr/lib/mysql/plugin/ha_connect.so
-etc/mysql/conf.d/connect.cnf

debian/mariadb-oqgraph-engine-10.0.files

-usr/lib/mysql/plugin/ha_oqgraph.so

debian/mariadb-server-core-10.0.files

-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

debian/mariadb-test-10.0.dirs

-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/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

debian/mariadb-test-10.0.files

-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/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

debian/mariadb-test-10.0.links

-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

debian/mysql-common.dirs

-etc/mysql/conf.d/

debian/mysql-common.files

-etc/mysql/my.cnf
-usr/share/mysql-common/internal-use-only
-usr/share/lintian/overrides/mysql-common

debian/mysql-common.lintian-overrides

-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

debian/mysql-common.postrm

-#!/bin/bash -e
-
-if [ "$1" = "purge" ]; then
-  rmdir /etc/mysql 2>/dev/null || true
-fi
-
-#DEBHELPER#