Commit 2cedf3ec authored by Otto Kekäläinen's avatar Otto Kekäläinen

MDEV-21303: Fix man page packaging for new mariadb-* named binaries

This fixes Lintian errors and warnings:

E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mariadb-analyze.1
E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mariadb-optimize.1
E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mariadb-repair.1
E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mysqlanalyze.1
E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mysqloptimize.1
E: mariadb-client-10.5: manpage-not-compressed usr/share/man/man1/mysqlrepair.1
W: mariadb-client-10.5: binary-without-manpage usr/bin/mariadb-conv
W: libmariadb-dev: binary-without-manpage usr/bin/mariadb_config

If the binary name is mariadb_config, the manpage needs to be mariadb_config.1.

Also run 'wrap-and-sort -a -v' to get lists in correct order.

In addition, sort .gitignore and remove duplicate lines.
parent 80abfa0e
......@@ -567,21 +567,25 @@ client/mariadb-slap
client/mariadb-test
client/mariadb-upgrade
extra/mariabackup/mariadb-backup
extra/mariadb-waitpid
extra/mariadbd-safe-helper
extra/mariadb-waitpid
libmysqld/examples/mariadb-client-test-embedded
libmysqld/examples/mariadb-embedded
libmysqld/examples/mariadb-test-embedded
man/mariadb.1
man/mariadb-access.1
man/mariadb-admin.1
man/mariadb-backup.1
man/mariadb-binlog.1
man/mariadb-check.1
man/mariadb-config.1
man/mariadb-client-test-embedded.1
man/mariadb-client-test.1
man/mariadb-config.1
man/mariadb-client-test-embedded.1
man/mariadb_config.1
man/mariadb-convert-table-format.1
man/mariadbd.8
man/mariadbd-multi.1
man/mariadbd-safe.1
man/mariadbd-safe-helper.1
man/mariadb-dump.1
man/mariadb-dumpslow.1
man/mariadb-embedded.1
......@@ -596,18 +600,15 @@ man/mariadb-secure-installation.1
man/mariadb-setpermission.1
man/mariadb-show.1
man/mariadb-slap.1
man/mariadb-test-embedded.1
man/mariadb-test.1
man/mariadb-test-embedded.1
man/mariadb-tzinfo-to-sql.1
man/mariadb-upgrade.1
man/mariadb-waitpid.1
man/mariadb.1
man/mariadbd-multi.1
man/mariadbd-safe-helper.1
man/mariadbd-safe.1
man/mariadbd.8
scripts/mariadb-access
scripts/mariadb-convert-table-format
scripts/mariadbd-multi
scripts/mariadbd-safe
scripts/mariadb-dumpslow
scripts/mariadb-find-rows
scripts/mariadb-fix-extensions
......@@ -615,10 +616,8 @@ scripts/mariadb-hotcopy
scripts/mariadb-install-db
scripts/mariadb-secure-installation
scripts/mariadb-setpermission
scripts/mariadbd-multi
scripts/mariadbd-safe
sql/mariadb-tzinfo-to-sql
sql/mariadbd
sql/mariadb-tzinfo-to-sql
storage/rocksdb/mariadb-ldb
tests/mariadb-client-test
versioninfo_dll.rc
......
......@@ -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" "mysql_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")
......
......@@ -6,5 +6,5 @@ usr/lib/*/libmariadbclient.so
usr/lib/*/libmysqlservices.a
usr/lib/*/pkgconfig/mariadb.pc
usr/share/aclocal/mysql.m4
usr/share/man/man1/mariadb_config.1
usr/share/man/man1/mysql_config.1
usr/share/man/man1/mariadb-config.1
\ No newline at end of file
usr/bin/mariadb_config usr/bin/mariadb-config
usr/share/man/man1/mariadb_config.1.gz usr/share/man/man1/mariadb-config.1.gz
......@@ -14,6 +14,7 @@ usr/bin/mariadb-waitpid
usr/bin/mytop
usr/share/man/man1/mariadb-access.1
usr/share/man/man1/mariadb-admin.1
usr/share/man/man1/mariadb-conv.1
usr/share/man/man1/mariadb-dump.1
usr/share/man/man1/mariadb-dumpslow.1
usr/share/man/man1/mariadb-find-rows.1
......
usr/bin/mariadb-access usr/bin/mysqlaccess
usr/bin/mariadb-admin usr/bin/mysqladmin
usr/bin/mariadb-check usr/bin/mariadb-analyze
usr/bin/mariadb-check usr/bin/mariadb-optimize
usr/bin/mariadb-check usr/bin/mariadb-repair
usr/bin/mariadb-check usr/bin/mysqlanalyze
usr/bin/mariadb-check usr/bin/mysqloptimize
usr/bin/mariadb-check usr/bin/mysqlrepair
usr/bin/mariadb-dump usr/bin/mysqldump
usr/bin/mariadb-dumpslow usr/bin/mysqldumpslow
usr/bin/mariadb-find-rows usr/bin/mysql_find_rows
......@@ -9,15 +15,9 @@ usr/bin/mariadb-report usr/bin/mysqlreport
usr/bin/mariadb-show usr/bin/mysqlshow
usr/bin/mariadb-slap usr/bin/mysqlslap
usr/bin/mariadb-waitpid usr/bin/mysql_waitpid
usr/bin/mariadb-check usr/bin/mariadb-analyze
usr/bin/mariadb-check usr/bin/mariadb-optimize
usr/bin/mariadb-check usr/bin/mariadb-repair
usr/bin/mariadb-check usr/bin/mysqlanalyze
usr/bin/mariadb-check usr/bin/mysqloptimize
usr/bin/mariadb-check usr/bin/mysqlrepair
usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb-analyze.1
usr/share/man/man1/mariadb-check.1 usr/share/man/man1/mariadb-optimize.1
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-check.1.gz usr/share/man/man1/mariadb-analyze.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-optimize.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-repair.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlanalyze.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqloptimize.1.gz
usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlrepair.1.gz
......@@ -6,10 +6,10 @@ usr/sbin/mariadbd
usr/share/man/man1/innochecksum.1
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/mariadbd.8
usr/share/man/man8/mysqld.8
usr/share/mysql/charsets
usr/share/mysql/czech
......
......@@ -17,10 +17,10 @@ usr/lib/mysql/plugin/qa_auth_client.so
usr/lib/mysql/plugin/qa_auth_interface.so
usr/lib/mysql/plugin/qa_auth_server.so
usr/lib/mysql/plugin/test_versioning.so
usr/share/man/man1/mariadb-client-test.1
usr/share/man/man1/mariadb-client-test-embedded.1
usr/share/man/man1/mariadb-test.1
usr/share/man/man1/mariadb-client-test.1
usr/share/man/man1/mariadb-test-embedded.1
usr/share/man/man1/mariadb-test.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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment