Skip to content

Commit

Permalink
MDEV-21303 Make executables MariaDB named
Browse files Browse the repository at this point in the history
fix manpages in Debian
  • Loading branch information
vuvova committed Mar 21, 2020
1 parent 9e1b3af commit 5d1b8f4
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion cmake/symlinks.cmake
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions debian/libmariadb-dev-compat.links
Expand Up @@ -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
5 changes: 2 additions & 3 deletions debian/libmariadb-dev.install
@@ -1,10 +1,9 @@
usr/bin/mariadb-config
usr/bin/mariadb_config
usr/include/mariadb
usr/lib/*/libmariadb.so
usr/lib/*/libmariadbclient.a
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
usr/share/man/man1/mariadb-config.1
2 changes: 1 addition & 1 deletion debian/libmariadb-dev.links
@@ -1 +1 @@
usr/bin/mariadb-config usr/bin/mysql_config
usr/bin/mariadb_config usr/bin/mariadb-config
1 change: 0 additions & 1 deletion 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
1 change: 1 addition & 0 deletions 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
10 changes: 0 additions & 10 deletions debian/mariadb-client-10.5.install
Expand Up @@ -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
10 changes: 10 additions & 0 deletions debian/mariadb-client-10.5.links
Expand Up @@ -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
2 changes: 0 additions & 2 deletions debian/mariadb-client-core-10.5.install
Expand Up @@ -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
2 changes: 2 additions & 0 deletions 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
2 changes: 0 additions & 2 deletions 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
1 change: 1 addition & 0 deletions 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
10 changes: 0 additions & 10 deletions debian/mariadb-server-10.5.install
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions debian/mariadb-server-10.5.links
Expand Up @@ -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
3 changes: 0 additions & 3 deletions debian/mariadb-server-core-10.5.install
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions 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
4 changes: 0 additions & 4 deletions debian/mariadb-test.install
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions debian/mariadb-test.links
Expand Up @@ -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

0 comments on commit 5d1b8f4

Please sign in to comment.