From 5d1b8f4152c8b71ad8a911432dd8a6a00c470c52 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 21 Mar 2020 13:26:50 +0100 Subject: [PATCH] MDEV-21303 Make executables MariaDB named fix manpages in Debian --- cmake/symlinks.cmake | 2 +- debian/libmariadb-dev-compat.links | 1 + debian/libmariadb-dev.install | 5 ++--- debian/libmariadb-dev.links | 2 +- debian/mariadb-backup.install | 1 - debian/mariadb-backup.links | 1 + debian/mariadb-client-10.5.install | 10 ---------- debian/mariadb-client-10.5.links | 10 ++++++++++ debian/mariadb-client-core-10.5.install | 2 -- debian/mariadb-client-core-10.5.links | 2 ++ debian/mariadb-plugin-rocksdb.install | 2 -- debian/mariadb-plugin-rocksdb.links | 1 + debian/mariadb-server-10.5.install | 10 ---------- debian/mariadb-server-10.5.links | 10 ++++++++++ debian/mariadb-server-core-10.5.install | 3 --- debian/mariadb-server-core-10.5.links | 3 +++ debian/mariadb-test.install | 4 ---- debian/mariadb-test.links | 4 ++++ 18 files changed, 36 insertions(+), 37 deletions(-) diff --git a/cmake/symlinks.cmake b/cmake/symlinks.cmake index e040ff19f778c..b570242334a0d 100644 --- a/cmake/symlinks.cmake +++ b/cmake/symlinks.cmake @@ -17,7 +17,7 @@ REGISTER_SYMLINK("mariadb-binlog" "mysqlbinlog") REGISTER_SYMLINK("mariadb-check" "mysqlcheck") REGISTER_SYMLINK("mariadb-client-test-embedded" "mysql_client_test_embedded") REGISTER_SYMLINK("mariadb-client-test" "mysql_client_test") -REGISTER_SYMLINK("mariadb-config" "mariadb_config") +REGISTER_SYMLINK("mariadb-config" "mysql_config") REGISTER_SYMLINK("mariadb-convert-table-format" "mysql_convert_table_format") REGISTER_SYMLINK("mariadb-dump" "mysqldump") REGISTER_SYMLINK("mariadb-dumpslow" "mysqldumpslow") diff --git a/debian/libmariadb-dev-compat.links b/debian/libmariadb-dev-compat.links index e02260c012947..33dfd678d4292 100755 --- a/debian/libmariadb-dev-compat.links +++ b/debian/libmariadb-dev-compat.links @@ -2,3 +2,4 @@ usr/bin/mariadb_config usr/bin/mysql_config usr/include/mariadb usr/include/mysql usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc +usr/share/man/man1/mariadb-config.1 usr/share/man/man1/mysql_config.1 diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index 4d6d74643fbf6..7c0ed69718f55 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -1,4 +1,4 @@ -usr/bin/mariadb-config +usr/bin/mariadb_config usr/include/mariadb usr/lib/*/libmariadb.so usr/lib/*/libmariadbclient.a @@ -6,5 +6,4 @@ usr/lib/*/libmariadbclient.so usr/lib/*/libmysqlservices.a usr/lib/*/pkgconfig/mariadb.pc usr/share/aclocal/mysql.m4 -usr/share/man/man1/mysql_config.1 -usr/share/man/man1/mariadb-config.1 \ No newline at end of file +usr/share/man/man1/mariadb-config.1 diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links index 80ae8c1e700dc..8f1a3bfb51d06 100644 --- a/debian/libmariadb-dev.links +++ b/debian/libmariadb-dev.links @@ -1 +1 @@ -usr/bin/mariadb-config usr/bin/mysql_config \ No newline at end of file +usr/bin/mariadb_config usr/bin/mariadb-config diff --git a/debian/mariadb-backup.install b/debian/mariadb-backup.install index b332b8724d5ba..a288377ddd02c 100644 --- a/debian/mariadb-backup.install +++ b/debian/mariadb-backup.install @@ -1,5 +1,4 @@ usr/bin/mariadb-backup usr/bin/mbstream -usr/share/man/man1/mariabackup.1 usr/share/man/man1/mariadb-backup.1 usr/share/man/man1/mbstream.1 diff --git a/debian/mariadb-backup.links b/debian/mariadb-backup.links index 924b476393b8f..954c839cf10c9 100644 --- a/debian/mariadb-backup.links +++ b/debian/mariadb-backup.links @@ -1 +1,2 @@ usr/bin/mariadb-backup usr/bin/mariabackup +usr/share/man/man1/mariadb-backup.1 usr/share/man/man1/mariabackup.1 diff --git a/debian/mariadb-client-10.5.install b/debian/mariadb-client-10.5.install index eba63ad76cd7c..50482fb8b14e7 100644 --- a/debian/mariadb-client-10.5.install +++ b/debian/mariadb-client-10.5.install @@ -22,14 +22,4 @@ usr/share/man/man1/mariadb-import.1 usr/share/man/man1/mariadb-show.1 usr/share/man/man1/mariadb-slap.1 usr/share/man/man1/mariadb-waitpid.1 -usr/share/man/man1/mysql_find_rows.1 -usr/share/man/man1/mysql_fix_extensions.1 -usr/share/man/man1/mysql_waitpid.1 -usr/share/man/man1/mysqlaccess.1 -usr/share/man/man1/mysqladmin.1 -usr/share/man/man1/mysqldump.1 -usr/share/man/man1/mysqldumpslow.1 -usr/share/man/man1/mysqlimport.1 -usr/share/man/man1/mysqlshow.1 -usr/share/man/man1/mysqlslap.1 usr/share/man/man1/mytop.1 diff --git a/debian/mariadb-client-10.5.links b/debian/mariadb-client-10.5.links index 85b2c73a30b1a..3aaf440724a6c 100644 --- a/debian/mariadb-client-10.5.links +++ b/debian/mariadb-client-10.5.links @@ -21,3 +21,13 @@ usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb-repair.1 usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqlanalyze.1 usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqloptimize.1 usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqlrepair.1 +usr/share/man/man1/mariadb-access.1 usr/share/man/man1/mysqlaccess.1 +usr/share/man/man1/mariadb-admin.1 usr/share/man/man1/mysqladmin.1 +usr/share/man/man1/mariadb-dump.1 usr/share/man/man1/mysqldump.1 +usr/share/man/man1/mariadb-dumpslow.1 usr/share/man/man1/mysqldumpslow.1 +usr/share/man/man1/mariadb-find-rows.1 usr/share/man/man1/mysql_find_rows.1 +usr/share/man/man1/mariadb-fix-extensions.1 usr/share/man/man1/mysql_fix_extensions.1 +usr/share/man/man1/mariadb-import.1 usr/share/man/man1/mysqlimport.1 +usr/share/man/man1/mariadb-show.1 usr/share/man/man1/mysqlshow.1 +usr/share/man/man1/mariadb-slap.1 usr/share/man/man1/mysqlslap.1 +usr/share/man/man1/mariadb-waitpid.1 usr/share/man/man1/mysql_waitpid.1 diff --git a/debian/mariadb-client-core-10.5.install b/debian/mariadb-client-core-10.5.install index 224e324b7041c..bb96e05152ee5 100644 --- a/debian/mariadb-client-core-10.5.install +++ b/debian/mariadb-client-core-10.5.install @@ -2,5 +2,3 @@ usr/bin/mariadb usr/bin/mariadb-check usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb.1 -usr/share/man/man1/mysql.1 -usr/share/man/man1/mysqlcheck.1 diff --git a/debian/mariadb-client-core-10.5.links b/debian/mariadb-client-core-10.5.links index 343cf6ff78bf9..ce6b296a9541d 100644 --- a/debian/mariadb-client-core-10.5.links +++ b/debian/mariadb-client-core-10.5.links @@ -1,2 +1,4 @@ usr/bin/mariadb usr/bin/mysql usr/bin/mariadb-check usr/bin/mysqlcheck +usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mysqlcheck.1 +usr/share/man/man1/mariadb.1 usr/share/man/man1/mysql.1 diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install index 0ac42fed69aa5..fdce65cf8ef06 100644 --- a/debian/mariadb-plugin-rocksdb.install +++ b/debian/mariadb-plugin-rocksdb.install @@ -1,8 +1,6 @@ etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d usr/bin/mariadb-ldb usr/bin/myrocks_hotbackup -usr/bin/sst_dump usr/lib/mysql/plugin/ha_rocksdb.so usr/share/man/man1/mariadb-ldb.1 usr/share/man/man1/myrocks_hotbackup.1 -usr/share/man/man1/mysql_ldb.1 diff --git a/debian/mariadb-plugin-rocksdb.links b/debian/mariadb-plugin-rocksdb.links index d24682a5a6618..78d9ce5ac5059 100644 --- a/debian/mariadb-plugin-rocksdb.links +++ b/debian/mariadb-plugin-rocksdb.links @@ -1 +1,2 @@ usr/bin/mariadb-ldb usr/bin/mysql_ldb +usr/share/man/man1/mariadb-ldb.1 usr/share/man/man1/mysql_ldb.1 diff --git a/debian/mariadb-server-10.5.install b/debian/mariadb-server-10.5.install index bd55098719779..fd98f72ae7d94 100644 --- a/debian/mariadb-server-10.5.install +++ b/debian/mariadb-server-10.5.install @@ -83,16 +83,6 @@ usr/share/man/man1/myisam_ftdump.1 usr/share/man/man1/myisamchk.1 usr/share/man/man1/myisamlog.1 usr/share/man/man1/myisampack.1 -usr/share/man/man1/mysql_convert_table_format.1 -usr/share/man/man1/mysql_plugin.1 -usr/share/man/man1/mysql_secure_installation.1 -usr/share/man/man1/mysql_setpermission.1 -usr/share/man/man1/mysql_tzinfo_to_sql.1 -usr/share/man/man1/mysqlbinlog.1 -usr/share/man/man1/mysqld_multi.1 -usr/share/man/man1/mysqld_safe.1 -usr/share/man/man1/mysqld_safe_helper.1 -usr/share/man/man1/mysqlhotcopy.1 usr/share/man/man1/perror.1 usr/share/man/man1/replace.1 usr/share/man/man1/resolve_stack_dump.1 diff --git a/debian/mariadb-server-10.5.links b/debian/mariadb-server-10.5.links index 9cc3a436ba8b2..3dcd08d372e8e 100644 --- a/debian/mariadb-server-10.5.links +++ b/debian/mariadb-server-10.5.links @@ -8,3 +8,13 @@ usr/bin/mariadb-tzinfo-to-sql usr/bin/mysql_tzinfo_to_sql usr/bin/mariadbd-multi usr/bin/mysqld_multi usr/bin/mariadbd-safe usr/bin/mysqld_safe usr/bin/mariadbd-safe-helper usr/bin/mysqld_safe_helper +usr/share/man/man1/mariadb-convert-table-format.1 usr/share/man/man1/mysql_convert_table_format.1 +usr/share/man/man1/mariadb-plugin.1 usr/share/man/man1/mysql_plugin.1 +usr/share/man/man1/mariadb-secure-installation.1 usr/share/man/man1/mysql_secure_installation.1 +usr/share/man/man1/mariadb-setpermission.1 usr/share/man/man1/mysql_setpermission.1 +usr/share/man/man1/mariadb-tzinfo-to-sql.1 usr/share/man/man1/mysql_tzinfo_to_sql.1 +usr/share/man/man1/mariadb-binlog.1 usr/share/man/man1/mysqlbinlog.1 +usr/share/man/man1/mariadbd-multi.1 usr/share/man/man1/mysqld_multi.1 +usr/share/man/man1/mariadbd-safe.1 usr/share/man/man1/mysqld_safe.1 +usr/share/man/man1/mariadbd-safe-helper.1 usr/share/man/man1/mysqld_safe_helper.1 +usr/share/man/man1/mariadb-hotcopy.1 usr/share/man/man1/mysqlhotcopy.1 diff --git a/debian/mariadb-server-core-10.5.install b/debian/mariadb-server-core-10.5.install index 133aad20b7481..3f7093a296aa5 100644 --- a/debian/mariadb-server-core-10.5.install +++ b/debian/mariadb-server-core-10.5.install @@ -8,9 +8,6 @@ usr/share/man/man1/mariadb-install-db.1 usr/share/man/man1/mariadb-upgrade.1 usr/share/man/man8/mariadbd.8 usr/share/man/man1/my_print_defaults.1 -usr/share/man/man1/mysql_install_db.1 -usr/share/man/man1/mysql_upgrade.1 -usr/share/man/man8/mysqld.8 usr/share/mysql/charsets usr/share/mysql/czech usr/share/mysql/danish diff --git a/debian/mariadb-server-core-10.5.links b/debian/mariadb-server-core-10.5.links index c2be98f38fb70..2729efd6543e2 100644 --- a/debian/mariadb-server-core-10.5.links +++ b/debian/mariadb-server-core-10.5.links @@ -1,3 +1,6 @@ usr/bin/mariadb-install-db usr/bin/mysql_install_db usr/bin/mariadb-upgrade usr/bin/mysql_upgrade usr/sbin/mariadbd usr/sbin/mysqld +usr/share/man/man1/mariadb-install-db.1 usr/share/man/man1/mysql_install_db.1 +usr/share/man/man1/mariadb-upgrade.1 usr/share/man/man1/mysql_upgrade.1 +usr/share/man/man8/mariadbd.8 usr/share/man/man8/mysqld.8 diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index 7a0ed767badf3..83733096b8330 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -23,10 +23,6 @@ usr/share/man/man1/mariadb-test.1 usr/share/man/man1/mariadb-test-embedded.1 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 -usr/share/man/man1/mysqltest_embedded.1 usr/share/mysql/mysql-test/README usr/share/mysql/mysql-test/README-gcov usr/share/mysql/mysql-test/README.stress diff --git a/debian/mariadb-test.links b/debian/mariadb-test.links index 718a53554745d..e009f2b88d08b 100644 --- a/debian/mariadb-test.links +++ b/debian/mariadb-test.links @@ -4,3 +4,7 @@ usr/bin/mariadb-test usr/bin/mysqltest usr/bin/mariadb-test-embedded usr/bin/mysqltest_embedded usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run +usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mysql_client_test.1 +usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mysql_client_test_embedded.1 +usr/share/man/man1/mariadb-client-test.1 usr/share/man/man1/mysqltest.1 +usr/share/man/man1/mariadb-test-embedded.1 usr/share/man/man1/mysqltest_embedded.1