[Pkg-mysql-commits] r1783 - mysql-dfsg-5.1/branches/unstable/debian

[Norbert Tretkowski]

Author: nobse
Date: 2009-11-21 10:39:27 +0000 (Sat, 21 Nov 2009)
New Revision: 1783

Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/control
   mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.dirs
   mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.postinst
Log:
Fix some lintian errors and warnings

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-11-20 21:39:10 UTC (rev 1782)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-11-21 10:39:27 UTC (rev 1783)
@@ -1,8 +1,12 @@
 mysql-dfsg-5.1 (5.1.41-2) UNRELEASED; urgency=low
 
   * Move InnoDB plugin into -server package.
+  * Fix some lintian errors and warnings:
+    + weak-library-dev-dependency
+    + dir-or-file-in-var-run
+    + command-with-path-in-maintainer-script
 
- -- Norbert Tretkowski <nobse at debian.org>  Fri, 20 Nov 2009 20:52:49 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 21 Nov 2009 11:33:27 +0100
 
 mysql-dfsg-5.1 (5.1.41-1) unstable; urgency=medium
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/control
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/control	2009-11-20 21:39:10 UTC (rev 1782)
+++ mysql-dfsg-5.1/branches/unstable/debian/control	2009-11-21 10:39:27 UTC (rev 1783)
@@ -48,7 +48,7 @@
 Package: libmysqlclient-dev
 Architecture: any
 Section: libdevel
-Depends: libmysqlclient16 (>= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
+Depends: libmysqlclient16 (= ${source:Version}), zlib1g-dev, , ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev, libmysqlclient15-dev
 Provides: libmysqlclient15-dev
 Replaces: libmysqlclient15-dev

Modified: mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.dirs
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.dirs	2009-11-20 21:39:10 UTC (rev 1782)
+++ mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.dirs	2009-11-21 10:39:27 UTC (rev 1783)
@@ -5,5 +5,4 @@
 usr/sbin
 usr/share/man/man8
 usr/share/mysql
-var/run/mysqld
 var/lib/mysql-upgrade

Modified: mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.postinst
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.postinst	2009-11-20 21:39:10 UTC (rev 1782)
+++ mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.postinst	2009-11-21 10:39:27 UTC (rev 1783)
@@ -139,7 +139,7 @@
     # Debian: beware of the bashisms... 
     # Debian: can safely run on upgrades with existing databases 
     set +e
-    /bin/bash /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
+    bash /usr/bin/mysql_install_db --rpm 2>&1 | $ERR_LOGGER
     if [ "$?" != "0" ]; then
       echo "ATTENTION: An error has occured. More info is in the syslog!"
     fi
@@ -188,10 +188,10 @@
     chmod 0600 $dc
 
     # update privilege tables
-    password_column_fix_query=`/bin/echo -e \
+    password_column_fix_query=`echo -e \
         "USE mysql\n" \
         "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
-    replace_query=`/bin/echo -e \
+    replace_query=`echo -e \
         "USE mysql\n" \
         "REPLACE INTO user SET " \
         "  host='localhost', user='debian-sys-maint', password=password('$pass'), " \
@@ -203,7 +203,7 @@
         "  Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
         "  Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
         "  Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
-    fix_privs=`/bin/echo -e \
+    fix_privs=`echo -e \
         "USE mysql;\n" \
         "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
         "ALTER TABLE user ADD column Show_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
@@ -215,7 +215,7 @@
     # Engines supported by etch should be installed per default. The query sequence is supposed
     # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
     # admin might already have chosen to remove one or more plugins. Newlines are necessary.
-    install_plugins=`/bin/echo -e \
+    install_plugins=`echo -e \
         "USE mysql;\n" \
         "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
         "  dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \