From 151fbc9a49fe697d5f004e1c792db46e5351340c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 16 Nov 2017 16:27:46 +0000 Subject: [PATCH] Handle new and/or missing files --- debian/libmariadbclient-dev.install | 1 + debian/not-installed | 20 ++++++-------------- debian/rules | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadbclient-dev.install index 403a3248..10554dfc 100755 --- a/debian/libmariadbclient-dev.install +++ b/debian/libmariadbclient-dev.install @@ -1,6 +1,7 @@ #!/usr/bin/dh-exec usr/bin/mysql_config usr/include/mysql/*.h +usr/include/mysql/private/*.h usr/include/mysql/psi/*.h usr/lib/*/libmariadbclient.a usr/lib/*/libmariadbclient.so diff --git a/debian/not-installed b/debian/not-installed index ffdfdc6e..abf1c468 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -370,20 +370,6 @@ usr/bin/mysql_client_test usr/bin/mysql_client_test_embedded usr/bin/mysqltest usr/bin/mysqltest_embedded -usr/lib/*/mariadb18/plugin/adt_null.so -usr/lib/*/mariadb18/plugin/auth_0x0100.so -usr/lib/*/mariadb18/plugin/auth_test_plugin.so -usr/lib/*/mariadb18/plugin/daemon_example.ini -usr/lib/*/mariadb18/plugin/debug_key_management.so -usr/lib/*/mariadb18/plugin/dialog_examples.so -usr/lib/*/mariadb18/plugin/example_key_management.so -usr/lib/*/mariadb18/plugin/ha_example.so -usr/lib/*/mariadb18/plugin/ha_test_sql_discovery.so -usr/lib/*/mariadb18/plugin/libdaemon_example.so -usr/lib/*/mariadb18/plugin/mypluglib.so -usr/lib/*/mariadb18/plugin/qa_auth_client.so -usr/lib/*/mariadb18/plugin/qa_auth_interface.so -usr/lib/*/mariadb18/plugin/qa_auth_server.so usr/share/man/man1/mysql-stress-test.pl.1 usr/share/man/man1/mysql-test-run.pl.1 usr/share/man/man1/mysql_client_test.1 @@ -400,3 +386,9 @@ 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 +usr/share/groonga-normalizer-mysql/README.md +usr/share/groonga-normalizer-mysql/lgpl-2.0.txt +usr/share/mysql/mroonga/COPYING +usr/share/mysql/mroonga/AUTHORS +usr/share/groonga/README.md +usr/share/groonga/COPYING diff --git a/debian/rules b/debian/rules index 45ce95db..eaa1745d 100755 --- a/debian/rules +++ b/debian/rules @@ -128,6 +128,22 @@ endif rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/*.py rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/t/*.py + # Remove test plugins + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/adt_null.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/auth_0x0100.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/auth_test_plugin.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/daemon_example.ini + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/debug_key_management.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/dialog_examples.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/example_key_management.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/ha_example.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/ha_test_sql_discovery.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/libdaemon_example.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/mypluglib.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/qa_auth_client.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/qa_auth_interface.so + rm -f $(TMP)/usr/lib/*/mariadb18/plugin/qa_auth_server.so + # nm numeric soft is not enough, therefore extra sort in command # to satisfy Debian reproducible build requirements nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.1/mysqld.sym.gz -- GitLab