From 2cedf3eca446220f3d250988facf4b244367d856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 27 Mar 2020 00:48:34 +0200 Subject: 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. --- .gitignore | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index bbc357a8d6f..8d3b5245447 100644 --- a/.gitignore +++ b/.gitignore @@ -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 -- cgit v1.2.1