From 333e1d82fcb960b18a99b831d8bd27be848940ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@kekalainen.net>
Date: Fri, 27 Mar 2020 01:31:35 +0200
Subject: [PATCH] Deb: Update control file Depends to include only variables
 that are set

Don't include variables that are empty and unused.
---
 debian/control                       | 17 ++++++++---------
 debian/libmariadb-dev-compat.install |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index e033d47039c..0e6a59acecc 100644
--- a/debian/control
+++ b/debian/control
@@ -69,8 +69,7 @@ Architecture: any
 Section: libs
 Depends: libmariadb3,
          mariadb-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Breaks: libmysqlclient19,
         libmysqlclient20,
         libmysqlclient21
@@ -196,8 +195,7 @@ Provides: libmysqld-dev
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmariadb-dev (= ${binary:Version}),
          libmariadbd19 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Breaks: libmysqld-dev
 Replaces: libmysqld-dev
 Description: MariaDB embedded database, development files
@@ -210,8 +208,7 @@ Description: MariaDB embedded database, development files
 
 Package: mysql-common
 Architecture: all
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}
 Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -224,8 +221,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
 Package: mariadb-common
 Architecture: all
 Depends: mysql-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
  server. SQL (Structured Query Language) is the most popular database query
@@ -478,6 +474,7 @@ Depends: galera-4 (>=26.4),
          rsync,
          socat,
          ${misc:Depends},
+         ${perl:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-10.0,
@@ -782,6 +779,7 @@ Depends: mariadb-client-10.5 (= ${binary:Version}),
          mariadb-server-10.5 (= ${binary:Version}),
          mariadb-test-data (= ${source:Version}),
          ${misc:Depends},
+         ${perl:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-server-5.5,
         mariadb-test-10.0,
@@ -822,7 +820,8 @@ Description: MariaDB database regression test suite
 Package: mariadb-test-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: mariadb-test-10.0,
         mariadb-test-10.1,
         mariadb-test-10.2,
diff --git a/debian/libmariadb-dev-compat.install b/debian/libmariadb-dev-compat.install
index cd69216d9c3..86de3f1bc56 100644
--- a/debian/libmariadb-dev-compat.install
+++ b/debian/libmariadb-dev-compat.install
@@ -1,5 +1,5 @@
+usr/bin/mysql_config
 usr/lib/*/libmysqlclient.a
 usr/lib/*/libmysqlclient.so
 usr/lib/*/libmysqlclient_r.a
 usr/lib/*/libmysqlclient_r.so
-usr/bin/mysql_config