Move mysql_upgrade to server core package to enable upgrades

Server core package consumers like Akonadi needs the mysql_upgrade
to upgrade the database without the need to install the full server
package.

debian/changelog

@@ -11,6 +11,9 @@ mariadb-10.0 (10.0.23-2) UNRELEASED; urgency=low
   * There is no need for mariadb-test packages to contain the version in the
     package name, so remove it. It only makes sense to keep the version number
     in the client and server packages, which users actually want to pin to.
+  * Move mysql_upgrade to server core package so that Akonadi and similar
+    core package consumers can upgrade the database. Also update control file
+    with breaks/replaces to allow smooth upgrades (Closes: #793977).
 
  -- Otto Kekäläinen <otto@seravo.fi>  Mon, 28 Dec 2015 09:51:36 +0200
 

debian/control

@@ -129,6 +129,7 @@ Depends: mariadb-common (>= ${source:Version}),
          ${shlibs:Depends}
 Conflicts: mariadb-galera-server-5.5, mysql-server-5.5, mysql-server-5.6
 Breaks: mariadb-client-10.0 (<< ${source:Version}),
+        mariadb-server-10.0 (<< ${source:Version}),
         mariadb-server-core-5.5,
         mysql-client-5.5,
         mysql-client-5.6,
@@ -136,6 +137,7 @@ Breaks: mariadb-client-10.0 (<< ${source:Version}),
         mysql-server-core-5.6,
         virtual-mysql-server-core
 Replaces: mariadb-client-10.0 (<< ${source:Version}),
+          mariadb-server-10.0 (<< ${source:Version}),
           mariadb-server-core-5.5,
           mysql-client-5.5,
           mysql-client-5.6,

debian/mariadb-server-10.0.install

@@ -21,7 +21,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/mysql_zap
 usr/bin/mysqlbinlog
 usr/bin/mysqld_multi

debian/mariadb-server-10.0.manpages

@@ -19,7 +19,6 @@ 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/mysql_upgrade.1
 debian/tmp/usr/share/man/man1/mysql_zap.1
 debian/tmp/usr/share/man/man1/perror.1
 debian/tmp/usr/share/man/man1/replace.1

debian/mariadb-server-core-10.0.install

 usr/bin/innochecksum
+usr/bin/mysql_upgrade
 usr/sbin/mysqld
 usr/share/mysql/charsets
 usr/share/mysql/czech

debian/mariadb-server-core-10.0.manpages

 debian/tmp/usr/share/man/man8/mysqld.8
 debian/tmp/usr/share/man/man1/innochecksum.1
+debian/tmp/usr/share/man/man1/mysql_upgrade.1