From b5edb4ca3a39c46e0109cf888aeb6ca54a6fc9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 12 Jan 2018 16:56:55 +0000 Subject: [PATCH] Deb: Add missing files into correct packages and rest in not-installed There was a lot of files generated by the sources that were not installed in any package. This fixes most of those issues, but not all. Files still outside any package are in the not-installed, which is used by dh_install. Also make sure all configuration files are installed to the correct location that matches layout used by Debian official packages. --- debian/libmariadb3.install | 2 + debian/mariadb-common.install | 2 +- .../mariadb-plugin-aws-key-management.install | 3 +- debian/mariadb-plugin-connect.install | 2 +- debian/mariadb-plugin-mroonga.install | 2 + debian/mariadb-server-10.3.install | 1 + debian/mariadb-test.install | 3 + debian/not-installed | 127 ++++++++++++++++++ 8 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 debian/not-installed diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index 55e2f3f4193..68d763ae404 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -1,3 +1,5 @@ usr/lib/*/libmariadb.so.* usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/mysql_clear_password.so +usr/lib/mysql/plugin/client_ed25519.so +usr/lib/mysql/plugin/sha256_password.so diff --git a/debian/mariadb-common.install b/debian/mariadb-common.install index 78dbc22b9f6..611c7d4d36e 100644 --- a/debian/mariadb-common.install +++ b/debian/mariadb-common.install @@ -1 +1 @@ -debian/additions/mariadb.cnf etc/mysql/conf.d +debian/additions/mariadb.cnf etc/mysql/ diff --git a/debian/mariadb-plugin-aws-key-management.install b/debian/mariadb-plugin-aws-key-management.install index ed966b4115d..655735cb8ac 100644 --- a/debian/mariadb-plugin-aws-key-management.install +++ b/debian/mariadb-plugin-aws-key-management.install @@ -1,2 +1,3 @@ usr/lib/mysql/plugin/aws_key_management.so -debian/additions/enable_encryption.preset etc/mysql/conf.d/ +debian/additions/enable_encryption.preset etc/mysql/mariadb.conf.d +etc/mysql/conf.d/aws_key_management.cnf etc/mysql/mariadb.conf.d diff --git a/debian/mariadb-plugin-connect.install b/debian/mariadb-plugin-connect.install index 8a7aee412df..22d73c7df05 100644 --- a/debian/mariadb-plugin-connect.install +++ b/debian/mariadb-plugin-connect.install @@ -1,2 +1,2 @@ -etc/mysql/conf.d/connect.cnf +etc/mysql/conf.d/connect.cnf etc/mysql/mariadb.conf.d usr/lib/mysql/plugin/ha_connect.so diff --git a/debian/mariadb-plugin-mroonga.install b/debian/mariadb-plugin-mroonga.install index c28fde2fd18..5cb81419e5e 100644 --- a/debian/mariadb-plugin-mroonga.install +++ b/debian/mariadb-plugin-mroonga.install @@ -1,3 +1,5 @@ usr/lib/mysql/plugin/ha_mroonga.so usr/share/mysql/mroonga/install.sql usr/share/mysql/mroonga/uninstall.sql +usr/share/mysql/mroonga/COPYING +usr/share/mysql/mroonga/AUTHORS diff --git a/debian/mariadb-server-10.3.install b/debian/mariadb-server-10.3.install index ac1ab6dd990..c0af11c5cc0 100644 --- a/debian/mariadb-server-10.3.install +++ b/debian/mariadb-server-10.3.install @@ -41,6 +41,7 @@ usr/bin/wsrep_sst_mariabackup usr/lib/mysql/plugin/auth_pam.so usr/lib/mysql/plugin/auth_socket.so usr/lib/mysql/plugin/file_key_management.so +usr/lib/mysql/plugin/auth_ed25519.so usr/lib/mysql/plugin/ha_archive.so usr/lib/mysql/plugin/ha_blackhole.so usr/lib/mysql/plugin/ha_federated.so diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index 6c59a78c2d7..4a3ef436634 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -26,6 +26,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/mysql/mysql-test/dgcov.pl +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 usr/share/man/man1/mysql_client_test_embedded.1 usr/share/man/man1/mysqltest.1 diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 00000000000..c151cf753e6 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,127 @@ +lib/systemd/system/mariadb.service # Installed by rules file +lib/systemd/system/mariadb@.service # Installed by rules file +usr/bin/mysql_config # We already have the MariaDB variant +usr/bin/mysql_embedded # Huge 500 MB file. Not intended for distribution via any disto package. +usr/bin/mytop # Mytop is distributed from a separate source package +usr/lib/sysusers.d/sysusers.conf +usr/lib/tmpfiles.d/tmpfiles.conf +usr/lib/mysql/plugin/JavaWrappers.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless +usr/lib/mysql/plugin/JdbcInterface.jar # These are only built if JNI/libjawt.so is installed from e.g. openjdk-8-jre-headless +usr/share/doc/mariadb-server-10.3/COPYING +usr/share/doc/mariadb-server-10.3/COPYING.AGPLv3 +usr/share/doc/mariadb-server-10.3/COPYING.GPLv2 +usr/share/doc/mariadb-server-10.3/COPYING.thirdparty +usr/share/doc/mariadb-server-10.3/CREDITS +usr/share/doc/mariadb-server-10.3/EXCEPTIONS-CLIENT +usr/share/doc/mariadb-server-10.3/INSTALL-BINARY +usr/share/doc/mariadb-server-10.3/PATENTS +usr/share/doc/mariadb-server-10.3/README-wsrep +usr/share/groonga/COPYING +usr/share/groonga-normalizer-mysql/lgpl-2.0.txt +usr/share/groonga-normalizer-mysql/README.md +usr/share/groonga/README.md +usr/share/man/man1/my_safe_process.1 +usr/share/man/man1/mysql.server.1 +usr/share/mysql/binary-configure +usr/share/mysql/magic +usr/share/mysql/maria_add_gis_sp.sql +usr/share/mysql/mysqld_multi.server +usr/share/mysql/mysql-log-rotate +usr/share/mysql/mysql.server +usr/share/mysql/mysql-test/mtr # Already created by mariadb-test.links +usr/share/mysql/mysql-test/mysql-test-run # Already created by mariadb-test.links +usr/share/mysql/mysql_to_mariadb.sql +usr/share/mysql/policy/apparmor/README # In MariaDB we don't want to use AppArmor at the moment +usr/share/mysql/policy/apparmor/usr.sbin.mysqld # In MariaDB we don't want to use AppArmor at the moment +usr/share/mysql/policy/apparmor/usr.sbin.mysqld.local # In MariaDB we don't want to use AppArmor at the moment +usr/share/mysql/policy/selinux/mariadb-server.fc # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/policy/selinux/mariadb-server.te # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/policy/selinux/mariadb.te # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/policy/selinux/README # In MariaDB we don't want to use SELinux at the moment +usr/share/mysql/systemd/mariadb.service # Installed by rules file +usr/share/mysql/systemd/mariadb@.service # Installed by rules file +usr/share/mysql/systemd/use_galera_new_cluster.conf +usr/share/mysql/wsrep.cnf +usr/sql-bench/bench-count-distinct +usr/sql-bench/bench-init.pl # SQL-bench is distributed from a separate source package +usr/sql-bench/compare-results +usr/sql-bench/copy-db +usr/sql-bench/crash-me +usr/sql-bench/Data/ATIS/aircraft.txt +usr/sql-bench/Data/ATIS/airline.txt +usr/sql-bench/Data/ATIS/airport_service.txt +usr/sql-bench/Data/ATIS/airport.txt +usr/sql-bench/Data/ATIS/city.txt +usr/sql-bench/Data/ATIS/class_of_service.txt +usr/sql-bench/Data/ATIS/code_description.txt +usr/sql-bench/Data/ATIS/compound_class.txt +usr/sql-bench/Data/ATIS/connect_leg.txt +usr/sql-bench/Data/ATIS/date_day.txt +usr/sql-bench/Data/ATIS/day_name.txt +usr/sql-bench/Data/ATIS/dual_carrier.txt +usr/sql-bench/Data/ATIS/fare.txt +usr/sql-bench/Data/ATIS/fconnection.txt +usr/sql-bench/Data/ATIS/flight_class.txt +usr/sql-bench/Data/ATIS/flight_day.txt +usr/sql-bench/Data/ATIS/flight_fare.txt +usr/sql-bench/Data/ATIS/flight.txt +usr/sql-bench/Data/ATIS/food_service.txt +usr/sql-bench/Data/ATIS/ground_service.txt +usr/sql-bench/Data/ATIS/month_name.txt +usr/sql-bench/Data/ATIS/restrict_carrier.txt +usr/sql-bench/Data/ATIS/restrict_class.txt +usr/sql-bench/Data/ATIS/restriction.txt +usr/sql-bench/Data/ATIS/state.txt +usr/sql-bench/Data/ATIS/stop1.txt +usr/sql-bench/Data/ATIS/stop.txt +usr/sql-bench/Data/ATIS/time_interval.txt +usr/sql-bench/Data/ATIS/time_zone.txt +usr/sql-bench/Data/ATIS/transport.txt +usr/sql-bench/Data/Wisconsin/onek.data +usr/sql-bench/Data/Wisconsin/tenk.data +usr/sql-bench/graph-compare-results +usr/sql-bench/innotest1 +usr/sql-bench/innotest1a +usr/sql-bench/innotest1b +usr/sql-bench/innotest2 +usr/sql-bench/innotest2a +usr/sql-bench/innotest2b +usr/sql-bench/limits/access.cfg +usr/sql-bench/limits/access_odbc.cfg +usr/sql-bench/limits/Adabas.cfg +usr/sql-bench/limits/db2.cfg +usr/sql-bench/limits/empress.cfg +usr/sql-bench/limits/frontbase.cfg +usr/sql-bench/limits/Informix.cfg +usr/sql-bench/limits/interbase.cfg +usr/sql-bench/limits/interbase-dialect1.cfg +usr/sql-bench/limits/interbase-dialect3.cfg +usr/sql-bench/limits/interbase-superserver.cfg +usr/sql-bench/limits/mimer.cfg +usr/sql-bench/limits/msql.cfg +usr/sql-bench/limits/ms-sql65.cfg +usr/sql-bench/limits/ms-sql.cfg +usr/sql-bench/limits/mysql-3.22.cfg +usr/sql-bench/limits/mysql-3.23.cfg +usr/sql-bench/limits/mysql-4.0.cfg +usr/sql-bench/limits/mysql-4.1.cfg +usr/sql-bench/limits/mysql.cfg +usr/sql-bench/limits/oracle.cfg +usr/sql-bench/limits/pg.cfg +usr/sql-bench/limits/solid.cfg +usr/sql-bench/limits/solid-nt4.cfg +usr/sql-bench/limits/sybase.cfg +usr/sql-bench/myisam.cnf +usr/sql-bench/README +usr/sql-bench/run-all-tests +usr/sql-bench/server-cfg +usr/sql-bench/test-alter-table +usr/sql-bench/test-ATIS +usr/sql-bench/test-big-tables +usr/sql-bench/test-connect +usr/sql-bench/test-create +usr/sql-bench/test-insert +usr/sql-bench/test-select +usr/sql-bench/test-table-elimination +usr/sql-bench/test-transactions +usr/sql-bench/test-wisconsin