MDEV-6284: Fix issues detected by Lintian

3 files changed, 7 insertions, 22 deletions

diff --git a/debian/control b/debian/control
index 37f5b07f341..3398090aecc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,11 @@ Source: mariadb-10.2
 Section: database
 Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
-Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: bison,
                chrpath,
                cmake (>= 2.7),
-               debhelper,
+               debhelper (>= 9),
                dh-apparmor,
-               dpatch,
                libaio-dev,
                libboost-dev,
                libjemalloc-dev (>= 3.0.0~) [linux-any],
@@ -34,8 +32,7 @@ Vcs-Browser: https://github.com/MariaDB/server/
 Package: libmariadbclient18
 Architecture: any
 Section: libs
-Depends: libmysqlclient18 (= ${binary:Version}),
-         mariadb-common,
+Depends: mariadb-common,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
@@ -466,7 +463,7 @@ Description: OQGraph storage engine for MariaDB
 
 Package: mariadb-plugin-tokudb
 Architecture: any
-Depends: mariadb-server-10.2|mariadb-galera-server-10.2,
+Depends: mariadb-server-10.2,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
@@ -479,7 +476,7 @@ Description: TokuDB storage engine for MariaDB
 
 Package: mariadb-plugin-mroonga
 Architecture: any
-Depends: mariadb-server-10.2|mariadb-galera-server-10.2,
+Depends: mariadb-server-10.2,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
@@ -506,7 +503,7 @@ Description: Cassandra storage engine for MariaDB
 
 Package: mariadb-plugin-spider
 Architecture: any
-Depends: mariadb-server-10.2|mariadb-galera-server-10.2,
+Depends: mariadb-server-10.2,
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-10.0 (<< ${source:Version}), mariadb-server-10.1 (<< ${source:Version}), mariadb-server-10.2 (<< ${source:Version})
@@ -518,17 +515,15 @@ Description: Spider storage engine for MariaDB
  possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
 
 Package: mariadb-plugin-gssapi-server
-Section: database
 Architecture: any
-Depends: libgssapi-krb5-2, mariadb-server-10.2
+Depends: libgssapi-krb5-2, mariadb-server-10.2, ${misc:Depends}, ${shlibs:Depends}
 Breaks: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
 Replaces: mariadb-gssapi-server-10.1, mariadb-gssapi-server-10.2
 Description: GSSAPI authentication plugin for MariaDB server
 
 Package: mariadb-plugin-gssapi-client
-Section: database
 Architecture: any
-Depends: libgssapi-krb5-2, mariadb-client-10.2
+Depends: libgssapi-krb5-2, mariadb-client-10.2, ${misc:Depends}, ${shlibs:Depends}
 Breaks: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
 Replaces: mariadb-gssapi-client-10.1, mariadb-gssapi-client-10.2
 Description: GSSAPI authentication plugin for MariaDB client
diff --git a/debian/mariadb-server-10.2.install b/debian/mariadb-server-10.2.install
index e0b12402c1f..989724fbc08 100644
--- a/debian/mariadb-server-10.2.install
+++ b/debian/mariadb-server-10.2.install
@@ -56,7 +56,6 @@ usr/bin/mysql_plugin
 usr/bin/mysql_secure_installation
 usr/bin/mysql_setpermission
 usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
 usr/bin/mysqlbinlog
 usr/bin/mysqld_multi
 usr/bin/mysqld_safe
@@ -85,12 +84,10 @@ usr/share/man/man1/mysqlhotcopy.1
 usr/share/man/man1/mysql_install_db.1
 usr/share/man/man1/mysql_secure_installation.1
 usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysql_upgrade.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/innochecksum.1
 usr/share/man/man1/mysql_tzinfo_to_sql.1
 debian/additions/debian-start.inc.sh usr/share/mysql
 debian/additions/echo_stderr usr/share/mysql
diff --git a/debian/mariadb-test-data.install b/debian/mariadb-test-data.install
index 84d01dc31f1..23603dd14bf 100644
--- a/debian/mariadb-test-data.install
+++ b/debian/mariadb-test-data.install
@@ -1,13 +1,6 @@
 usr/share/mysql/mysql-test/collections
 usr/share/mysql/mysql-test/extra
 usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/lib
-usr/share/mysql/mysql-test/mysql-test-run.pl
-usr/share/mysql/mysql-test/disabled.def
-usr/share/mysql/mysql-test/valgrind.supp
-usr/share/mysql/mysql-test/mysql-stress-test.pl
-usr/share/mysql/mysql-test/README
-usr/share/mysql/mysql-test/README.stress
 usr/share/mysql/mysql-test/unstable-tests
 usr/share/mysql/mysql-test/plugin
 usr/share/mysql/mysql-test/r