Deb: .manpages files should only contain man pages unique to deb packages

All man pages that stem from the actual sources should be installed along
everything else in .install files.

14 files changed, 56 insertions, 56 deletions

diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install
index 5025ae4a47c..f33febf0e50 100644
--- a/debian/libmariadb-dev.install
+++ b/debian/libmariadb-dev.install
@@ -6,3 +6,4 @@ usr/lib/*/libmariadbclient.a
 usr/lib/*/libmysqlservices.a
 usr/share/aclocal/mysql.m4
 usr/share/pkgconfig/mariadb.pc
+usr/share/man/man1/mysql_config.1
diff --git a/debian/libmariadb-dev.manpages b/debian/libmariadb-dev.manpages
deleted file mode 100644
index 3aac7f4b4a9..00000000000
--- a/debian/libmariadb-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_config.1
diff --git a/debian/mariadb-client-10.3.install b/debian/mariadb-client-10.3.install
index 271f2a2f417..75ee09db783 100644
--- a/debian/mariadb-client-10.3.install
+++ b/debian/mariadb-client-10.3.install
@@ -10,3 +10,13 @@ usr/bin/mysqldumpslow
 usr/bin/mysqlimport
 usr/bin/mysqlshow
 usr/bin/mysqlslap
+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/mysql_find_rows.1
+usr/share/man/man1/mysql_fix_extensions.1
+usr/share/man/man1/mysqlimport.1
+usr/share/man/man1/mysqlshow.1
+usr/share/man/man1/mysqlslap.1
+usr/share/man/man1/mysql_waitpid.1
diff --git a/debian/mariadb-client-10.3.manpages b/debian/mariadb-client-10.3.manpages
index 504619785bc..6f3e2bc188c 100644
--- a/debian/mariadb-client-10.3.manpages
+++ b/debian/mariadb-client-10.3.manpages
@@ -1,12 +1,2 @@
 debian/additions/innotop/innotop.1
-debian/tmp/usr/share/man/man1/mysqlaccess.1
-debian/tmp/usr/share/man/man1/mysqladmin.1
-debian/tmp/usr/share/man/man1/mysqldump.1
-debian/tmp/usr/share/man/man1/mysqldumpslow.1
-debian/tmp/usr/share/man/man1/mysql_find_rows.1
-debian/tmp/usr/share/man/man1/mysql_fix_extensions.1
-debian/tmp/usr/share/man/man1/mysqlimport.1
 debian/additions/mysqlreport.1
-debian/tmp/usr/share/man/man1/mysqlshow.1
-debian/tmp/usr/share/man/man1/mysqlslap.1
-debian/tmp/usr/share/man/man1/mysql_waitpid.1
diff --git a/debian/mariadb-client-core-10.3.install b/debian/mariadb-client-core-10.3.install
index 6308d769930..a2781309439 100644
--- a/debian/mariadb-client-core-10.3.install
+++ b/debian/mariadb-client-core-10.3.install
@@ -1,2 +1,4 @@
 usr/bin/mysql
 usr/bin/mysqlcheck
+usr/share/man/man1/mysql.1
+usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-client-core-10.3.manpages b/debian/mariadb-client-core-10.3.manpages
deleted file mode 100644
index 2be91d81f9a..00000000000
--- a/debian/mariadb-client-core-10.3.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql.1
-debian/tmp/usr/share/man/man1/mysqlcheck.1
diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install
index 36beb14885f..d15db03b3e5 100644
--- a/debian/mariadb-plugin-tokudb.install
+++ b/debian/mariadb-plugin-tokudb.install
@@ -3,3 +3,5 @@ usr/bin/tokuft_logprint
 usr/bin/tokuftdump
 usr/lib/mysql/plugin/ha_tokudb.so
 usr/share/doc/mariadb-server-10.3/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
+usr/share/man/man1/tokuft_logdump.1
+usr/share/man/man1/tokuftdump.1
diff --git a/debian/mariadb-plugin-tokudb.manpages b/debian/mariadb-plugin-tokudb.manpages
deleted file mode 100644
index 102a593b809..00000000000
--- a/debian/mariadb-plugin-tokudb.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man1/tokuft_logdump.1
-debian/tmp/usr/share/man/man1/tokuftdump.1
diff --git a/debian/mariadb-server-10.3.install b/debian/mariadb-server-10.3.install
index 487837e9582..ac1ab6dd990 100644
--- a/debian/mariadb-server-10.3.install
+++ b/debian/mariadb-server-10.3.install
@@ -65,3 +65,36 @@ usr/share/mysql/mysql_system_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_test_data_timezone.sql
 usr/share/mysql/wsrep_notify
+usr/share/man/man1/aria_chk.1
+usr/share/man/man1/aria_dump_log.1
+usr/share/man/man1/aria_ftdump.1
+usr/share/man/man1/aria_pack.1
+usr/share/man/man1/aria_read_log.1
+usr/share/man/man1/galera_new_cluster.1
+usr/share/man/man1/galera_recovery.1
+usr/share/man/man1/mariadb-service-convert.1
+usr/share/man/man1/msql2mysql.1
+usr/share/man/man1/myisamchk.1
+usr/share/man/man1/myisam_ftdump.1
+usr/share/man/man1/myisamlog.1
+usr/share/man/man1/myisampack.1
+usr/share/man/man1/my_print_defaults.1
+usr/share/man/man1/mysqlbinlog.1
+usr/share/man/man1/mysql_convert_table_format.1
+usr/share/man/man1/mysqld_multi.1
+usr/share/man/man1/mysqld_safe.1
+usr/share/man/man1/mysqlhotcopy.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/mysqld_safe_helper.1
+usr/share/man/man1/perror.1
+usr/share/man/man1/replace.1
+usr/share/man/man1/resolveip.1
+usr/share/man/man1/resolve_stack_dump.1
+usr/share/man/man1/wsrep_sst_common.1
+usr/share/man/man1/wsrep_sst_mysqldump.1
+usr/share/man/man1/wsrep_sst_rsync.1
+usr/share/man/man1/wsrep_sst_xtrabackup-v2.1
+usr/share/man/man1/wsrep_sst_xtrabackup.1
diff --git a/debian/mariadb-server-10.3.manpages b/debian/mariadb-server-10.3.manpages
deleted file mode 100644
index a05b695585e..00000000000
--- a/debian/mariadb-server-10.3.manpages
+++ /dev/null
@@ -1,33 +0,0 @@
-debian/tmp/usr/share/man/man1/aria_chk.1
-debian/tmp/usr/share/man/man1/aria_dump_log.1
-debian/tmp/usr/share/man/man1/aria_ftdump.1
-debian/tmp/usr/share/man/man1/aria_pack.1
-debian/tmp/usr/share/man/man1/aria_read_log.1
-debian/tmp/usr/share/man/man1/galera_new_cluster.1
-debian/tmp/usr/share/man/man1/galera_recovery.1
-debian/tmp/usr/share/man/man1/mariadb-service-convert.1
-debian/tmp/usr/share/man/man1/msql2mysql.1
-debian/tmp/usr/share/man/man1/myisamchk.1
-debian/tmp/usr/share/man/man1/myisam_ftdump.1
-debian/tmp/usr/share/man/man1/myisamlog.1
-debian/tmp/usr/share/man/man1/myisampack.1
-debian/tmp/usr/share/man/man1/my_print_defaults.1
-debian/tmp/usr/share/man/man1/mysqlbinlog.1
-debian/tmp/usr/share/man/man1/mysql_convert_table_format.1
-debian/tmp/usr/share/man/man1/mysqld_multi.1
-debian/tmp/usr/share/man/man1/mysqld_safe.1
-debian/tmp/usr/share/man/man1/mysqlhotcopy.1
-debian/tmp/usr/share/man/man1/mysql_plugin.1
-debian/tmp/usr/share/man/man1/mysql_secure_installation.1
-debian/tmp/usr/share/man/man1/mysql_setpermission.1
-debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
-debian/tmp/usr/share/man/man1/mysqld_safe_helper.1
-debian/tmp/usr/share/man/man1/perror.1
-debian/tmp/usr/share/man/man1/replace.1
-debian/tmp/usr/share/man/man1/resolveip.1
-debian/tmp/usr/share/man/man1/resolve_stack_dump.1
-debian/tmp/usr/share/man/man1/wsrep_sst_common.1
-debian/tmp/usr/share/man/man1/wsrep_sst_mysqldump.1
-debian/tmp/usr/share/man/man1/wsrep_sst_rsync.1
-debian/tmp/usr/share/man/man1/wsrep_sst_xtrabackup-v2.1
-debian/tmp/usr/share/man/man1/wsrep_sst_xtrabackup.1
diff --git a/debian/mariadb-server-core-10.3.install b/debian/mariadb-server-core-10.3.install
index 6aadea0adc8..6244abd1193 100644
--- a/debian/mariadb-server-core-10.3.install
+++ b/debian/mariadb-server-core-10.3.install
@@ -27,3 +27,7 @@ usr/share/mysql/slovak
 usr/share/mysql/spanish
 usr/share/mysql/swedish
 usr/share/mysql/ukrainian
+usr/share/man/man8/mysqld.8
+usr/share/man/man1/innochecksum.1
+usr/share/man/man1/mysql_install_db.1
+usr/share/man/man1/mysql_upgrade.1
diff --git a/debian/mariadb-server-core-10.3.manpages b/debian/mariadb-server-core-10.3.manpages
deleted file mode 100644
index 04187d4cdf2..00000000000
--- a/debian/mariadb-server-core-10.3.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/share/man/man8/mysqld.8
-debian/tmp/usr/share/man/man1/innochecksum.1
-debian/tmp/usr/share/man/man1/mysql_install_db.1
-debian/tmp/usr/share/man/man1/mysql_upgrade.1
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install
index 605620dc28c..6c59a78c2d7 100644
--- a/debian/mariadb-test.install
+++ b/debian/mariadb-test.install
@@ -26,3 +26,7 @@ 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/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
diff --git a/debian/mariadb-test.manpages b/debian/mariadb-test.manpages
deleted file mode 100644
index 33ce8710ea7..00000000000
--- a/debian/mariadb-test.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_client_test.1
-debian/tmp/usr/share/man/man1/mysql_client_test_embedded.1
-debian/tmp/usr/share/man/man1/mysqltest.1
-debian/tmp/usr/share/man/man1/mysqltest_embedded.1