.deb packaging fixes: make mariadb-common a real package, which depends on

mysql-common and places mariadb-specific stuff in /etc/mysql/conf.d/mariadb.cnf.
This should allow to co-exist with default Debian mysql-common package and
help resolve dependencies when installing mariadb among multiple available
versions of MySQL from different repositories.

4 files changed, 38 insertions, 12 deletions

diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control
index 7de203fd3f0..562459618ec 100644
--- a/debian/dist/Debian/control
+++ b/debian/dist/Debian/control
@@ -71,7 +71,6 @@ Package: mysql-common
 Section: database
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: mariadb-common
 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
@@ -80,10 +79,19 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
  .
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/my.cnf).
+
+Package: mariadb-common
+Section: database
+Architecture: all
+Depends: mysql-common, ${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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
  .
- Due to libmysqlclient15off package depends, this package has not yet been
- renamed to mariadb-common. It does, however, already contain a new my.cnf
- file with mariadb-specific configuration options.
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
 Package: mariadb-client-core-5.5
 Architecture: any
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 06b5b108e10..3c060c99c88 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -172,11 +172,16 @@ install: build
 	mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/
 	mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/
 
-	# mysql-common: We now provide our own config file.
-	# can't be mariadb-common, other packages insist
+	# mysql-common: We provide our own version of this package for
+	# completeness, but we can use an existing version; mariadb-specic
+	# stuff is in mariadb-common
 	install -d $(TMP)/etc/mysql
 	install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
 
+	# mariadb-common: MariaDB-specific config stuff.
+	install -d $(TMP)/etc/mysql/conf.d
+	install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf
+
 	# mariadb-client
 	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control
index fd72e8d4fb2..8594ee9616b 100644
--- a/debian/dist/Ubuntu/control
+++ b/debian/dist/Ubuntu/control
@@ -71,7 +71,6 @@ Package: mysql-common
 Section: database
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: mariadb-common
 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
@@ -80,10 +79,19 @@ Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
  .
  This package includes files needed by all versions of the client library
  (e.g. /etc/mysql/my.cnf).
+
+Package: mariadb-common
+Section: database
+Architecture: all
+Depends: mysql-common, ${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
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
  .
- Due to libmysqlclient15off package depends, this package has not yet been
- renamed to mariadb-common. It does, however, already contain a new my.cnf
- file with mariadb-specific configuration options.
+ This package includes files needed by all versions of the client library
+ (e.g. /etc/mysql/conf.d/mariadb.cnf).
 
 Package: mariadb-client-core-5.5
 Architecture: any
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 2446566fd3f..f0ece68641d 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -172,11 +172,16 @@ install: build
 	mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/
 	mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/
 
-	# mysql-common: We now provide our own config file.
-	# can't be mariadb-common, other packages insist
+	# mysql-common: We provide our own version of this package for
+	# completeness, but we can use an existing version; mariadb-specic
+	# stuff is in mariadb-common
 	install -d $(TMP)/etc/mysql
 	install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
 
+	# mariadb-common: MariaDB-specific config stuff.
+	install -d $(TMP)/etc/mysql/conf.d
+	install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf
+
 	# mariadb-client
 	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
 	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/