Bug#864382: tpu: mariadb-10.1/10.1.23-9+deb9u1

[Andreas Beckmann <anbe@debian.org>]

Followup-For: Bug #864382
Control: tag -1 - moreinfo

Uploaded ... and realized that it includes the bugfix from 10.1.23-9
(fixing up -8) which I thought that it had already migrated to testing
(but that was only at -8).  Actual debdiff attached.

Let's hope this build without needing give-backs.


Andreas

diff -Nru mariadb-10.1-10.1.23/debian/changelog mariadb-10.1-10.1.23/debian/changelog
--- mariadb-10.1-10.1.23/debian/changelog	2017-05-13 11:08:43.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/changelog	2017-06-07 21:11:23.000000000 +0200
@@ -1,3 +1,18 @@
+mariadb-10.1 (10.1.23-9+deb9u1) stretch; urgency=medium
+
+  [ Ondřej Surý ]
+  * Add Breaks: cqrlog (<< 1.9.0-5~) to ensure correct upgrade order
+    (Closes: #864159)
+
+ -- Andreas Beckmann <anbe@debian.org>  Wed, 07 Jun 2017 21:11:23 +0200
+
+mariadb-10.1 (10.1.23-9) unstable; urgency=medium
+
+  * Fix the invalid location of insserv configuration snippet
+    (Thanks Michael Biebl for catching that)
+
+ -- Ondřej Surý <ondrej@debian.org>  Fri, 26 May 2017 09:26:33 +0200
+
 mariadb-10.1 (10.1.23-8) unstable; urgency=medium
 
   * Use /etc/insserv.conf.d/mariadb to provide $database system facility
diff -Nru mariadb-10.1-10.1.23/debian/control mariadb-10.1-10.1.23/debian/control
--- mariadb-10.1-10.1.23/debian/control	2017-05-13 11:08:43.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/control	2017-06-07 21:11:23.000000000 +0200
@@ -282,7 +282,8 @@
            mysql-server-core-5.6,
            mysql-server-core-5.7,
            virtual-mysql-server
-Breaks: mariadb-galera-server,
+Breaks: cqrlog (<< 1.9.0-5~),
+        mariadb-galera-server,
         mariadb-galera-server-10.0,
         mariadb-galera-server-5.5,
         mariadb-server-10.0,
diff -Nru mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install
--- mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install	2017-05-13 11:08:43.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/mariadb-server-10.1.install	2017-06-07 21:11:23.000000000 +0200
@@ -9,7 +9,7 @@
 debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d
 debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
 debian/additions/source_mariadb-10.1.py usr/share/apport/package-hooks
-debian/mariadb-server-10.1.insserv.conf etc/insserv.conf.d/mariadb
+debian/mariadb-server-10.1.insserv.conf => etc/insserv.conf.d/mariadb
 etc/apparmor.d/usr.sbin.mysqld
 [linux-any] lib/systemd/system/mariadb@.service
 [linux-any] lib/systemd/system/mariadb.service
diff -Nru mariadb-10.1-10.1.23/debian/mariadb-server-10.1.preinst mariadb-10.1-10.1.23/debian/mariadb-server-10.1.preinst
--- mariadb-10.1-10.1.23/debian/mariadb-server-10.1.preinst	2017-05-13 11:08:43.000000000 +0200
+++ mariadb-10.1-10.1.23/debian/mariadb-server-10.1.preinst	2017-06-07 21:11:23.000000000 +0200
@@ -9,6 +9,11 @@
 
 . /usr/share/debconf/confmodule
 
+# Just kill the invalid insserv.conf.d directory without fallback
+if [ -d "/etc/insserv.conf.d/mariadb/" ]; then
+    rm -rf "/etc/insserv.conf.d/mariadb/"
+fi
+
 if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
 ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }