Added versioned dependency on initscripts and revert /var/run

to /run change (Closes: #676560)

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2145 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

10 files changed, 17 insertions, 15 deletions

diff --git a/debian/additions/my.cnf b/debian/additions/my.cnf
index ddb0d69..1f96915 100644
--- a/debian/additions/my.cnf
+++ b/debian/additions/my.cnf
@@ -18,14 +18,14 @@
 # Remember to edit /etc/mysql/debian.cnf when changing the socket location.
 [client]
 port		= 3306
-socket		= /run/mysqld/mysqld.sock
+socket		= /var/run/mysqld/mysqld.sock
 
 # Here is entries for some specific programs
 # The following values assume you have at least 32M ram
 
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
-socket		= /run/mysqld/mysqld.sock
+socket		= /var/run/mysqld/mysqld.sock
 nice		= 0
 
 [mysqld]
@@ -33,8 +33,8 @@ nice		= 0
 # * Basic Settings
 #
 user		= mysql
-pid-file	= /run/mysqld/mysqld.pid
-socket		= /run/mysqld/mysqld.sock
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
 port		= 3306
 basedir		= /usr
 datadir		= /var/lib/mysql
diff --git a/debian/changelog b/debian/changelog
index 4858186..a14b1be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,8 @@ mysql-5.5 (5.5.25+dfsg-1) UNRELEASED; urgency=low
     and bumped dependency in shlibs (Closes: #660686)
   * Ensured that /etc/mysql/conf.d is installed as part of mysql-common
     so that client programs work without a co-located server (Closes: #672359)
+  * Added versioned dependency on initscripts and revert /var/run
+    to /run change (Closes: #676560)
 
  -- Nicholas Bamber <nicholas@periapt.co.uk>  Tue, 08 May 2012 09:04:25 +0100
 
diff --git a/debian/control b/debian/control
index bcaff93..4f01ab1 100644
--- a/debian/control
+++ b/debian/control
@@ -113,7 +113,7 @@ Architecture: any
 Recommends: libhtml-template-perl
 Suggests: tinyca, mailx
 Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
-Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
+Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version}), initscripts (>= 2.88dsf-13.3)
 Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
 Provides: virtual-mysql-server
 Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1,  mysql-server-5.0,
diff --git a/debian/mysql-server-5.5.logcheck.ignore.paranoid b/debian/mysql-server-5.5.logcheck.ignore.paranoid
index 3af54a9..00cc5c3 100644
--- a/debian/mysql-server-5.5.logcheck.ignore.paranoid
+++ b/debian/mysql-server-5.5.logcheck.ignore.paranoid
@@ -1,8 +1,8 @@
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
 /etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
 /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
 mysqld\[[0-9]+\]: $
-mysqld\[[0-9]+\]: Version: .* socket: '/run/mysqld/mysqld.sock'  port: 3306$
+mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock'  port: 3306$
 mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
 mysqld_safe\[[0-9]+\]: started$
 usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
diff --git a/debian/mysql-server-5.5.logcheck.ignore.server b/debian/mysql-server-5.5.logcheck.ignore.server
index 83a8881..37f25cb 100644
--- a/debian/mysql-server-5.5.logcheck.ignore.server
+++ b/debian/mysql-server-5.5.logcheck.ignore.server
@@ -1,5 +1,5 @@
 /etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
 /etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
 /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
 mysqld\[[0-9]+\]: ?$
diff --git a/debian/mysql-server-5.5.logcheck.ignore.workstation b/debian/mysql-server-5.5.logcheck.ignore.workstation
index 83a8881..37f25cb 100644
--- a/debian/mysql-server-5.5.logcheck.ignore.workstation
+++ b/debian/mysql-server-5.5.logcheck.ignore.workstation
@@ -1,5 +1,5 @@
 /etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
+/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$
 /etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
 /etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
 mysqld\[[0-9]+\]: ?$
diff --git a/debian/mysql-server-5.5.mysql.init b/debian/mysql-server-5.5.mysql.init
index d76676e..983a8c2 100644
--- a/debian/mysql-server-5.5.mysql.init
+++ b/debian/mysql-server-5.5.mysql.init
@@ -103,7 +103,7 @@ case "${1:-''}" in
 	   log_end_msg 0
 	else
 	    # Could be removed during boot
-	    test -e /run/mysqld || install -m 755 -o mysql -g root -d /run/mysqld
+	    test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld
 
 	    # Start MySQL! 
   	    /usr/bin/mysqld_safe > /dev/null 2>&1 &
diff --git a/debian/mysql-server-5.5.postinst b/debian/mysql-server-5.5.postinst
index 5e0df21..4dee8b0 100644
--- a/debian/mysql-server-5.5.postinst
+++ b/debian/mysql-server-5.5.postinst
@@ -56,17 +56,17 @@ EOF
        return $retval
 }
 
-# This is necessary because mysql_install_db removes the pid file in /run
+# This is necessary because mysql_install_db removes the pid file in /var/run
 # and because changed configuration options should take effect immediately.
 # In case the server wasn't running at all it should be ok if the stop
-# script fails. I can't tell at this point because of the cleaned /run.
+# script fails. I can't tell at this point because of the cleaned /var/run.
 set +e; invoke stop; set -e
     
 case "$1" in
   configure)
     mysql_datadir=/usr/share/mysql
     mysql_statedir=/var/lib/mysql
-    mysql_rundir=/run/mysqld
+    mysql_rundir=/var/run/mysqld
     mysql_logdir=/var/log
     mysql_cfgdir=/etc/mysql
     mysql_newlogdir=/var/log/mysql
diff --git a/debian/mysql-server-5.5.postrm b/debian/mysql-server-5.5.postrm
index 5b4139a..c292652 100644
--- a/debian/mysql-server-5.5.postrm
+++ b/debian/mysql-server-5.5.postrm
@@ -62,7 +62,7 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
     # else we ran into big trouble on the next install!
     rm -f /etc/mysql/debian.cnf
     rm -rf /var/lib/mysql
-    rm -rf /run/mysqld
+    rm -rf /var/run/mysqld
     userdel mysql || true
   fi
 
diff --git a/debian/rules b/debian/rules
index b1784b8..f44d38a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,7 @@ configure-stamp configure-pic-stamp:
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		$(FORCE_FPIC) \
-		-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 	       	-DMYSQL_USER=mysql \
 		-DWITH_LIBWRAP=ON \
 		-DWITH_READLINE=OFF \