[Pkg-mysql-commits] [mariadb-5.5] 06/08: Fixed multiple minor Lintian complains

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 9c069708ffabe867e02a6e2c828a48a901d984cc
Author: Otto Kekäläinen <otto at seravo.fi>
Date:   Sat Dec 27 19:43:54 2014 +0200

    Fixed multiple minor Lintian complains
---
 debian/control                              |  7 +++----
 debian/mariadb-server-5.5.lintian-overrides |  6 +++---
 debian/mariadb-server-5.5.postrm            | 17 ++---------------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index 8580e44..db7c476 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,7 @@ Build-Depends: bison,
                dh-apparmor,
                hardening-wrapper,
                libaio-dev [linux-any],
-               libjemalloc-dev (>= 3.0.0),
-               libjemalloc-dev [linux-any],
+               libjemalloc-dev (>= 3.0.0) [linux-any],
                libncurses5-dev (>= 5.0-6),
                libpam0g-dev,
                libreadline-gplv2-dev,
@@ -26,8 +25,8 @@ Build-Depends: bison,
                zlib1g-dev (>= 1:1.1.3-5)
 Standards-Version: 3.9.5
 Homepage: http://mariadb.org/
-Vcs-Git: git://git.debian.org/git/pkg-mysql/mariadb-5.5.git
-Vcs-Browser: http://git.debian.org/?p=pkg-mysql/mariadb-5.5.git
+Vcs-Git: git://anonscm.debian.org/pkg-mysql/mariadb-5.5.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-mysql/mariadb-5.5.git
 
 Package: libmariadbclient18
 Section: libs
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index 363c175..ff9ae25 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -1,6 +1,6 @@
 # Embedded from same source is OK
 mariadb-server-5.5: embedded-library usr/bin/mysqlbinlog: libmysqlclient
 # ash's buildin has no "-e" so use /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:195 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:209 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:217 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:199 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:213 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:221 /bin/echo
diff --git a/debian/mariadb-server-5.5.postrm b/debian/mariadb-server-5.5.postrm
index d7044bb..813ebd4 100644
--- a/debian/mariadb-server-5.5.postrm
+++ b/debian/mariadb-server-5.5.postrm
@@ -52,9 +52,9 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
   rm -f /var/log/mysql.{log,err}{,.0,.[1234567].gz}
   rm -rf /var/log/mysql
 
-  db_input high mysql-server-5.5/postrm_remove_databases || true
+  db_input high maria-server-5.5/postrm_remove_databases || true
   db_go || true
-  db_get mysql-server-5.5/postrm_remove_databases || true
+  db_get maria-server-5.5/postrm_remove_databases || true
   if [ "$RET" = "true" ]; then
     # never remove the debian.cnf when the databases are still existing
     # else we ran into big trouble on the next install!
@@ -63,20 +63,7 @@ if [ "$1" = "purge" -a ! \( -x /usr/sbin/mysqld -o -L /usr/sbin/mysqld \) ]; the
     rm -rf /var/run/mysqld # this directory is created by the init script, don't leave behind
     userdel mysql || true
   fi
-
-  # (normally) Automatically added by dh_installinit
-  if [ "$1" = "purge" ] ; then
-        update-rc.d mysql remove >/dev/null || exit 0
-  fi
-  # (normally) End automatically added section
-fi
-
-# (normally) Automatically added by dh_installdebconf
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-        . /usr/share/debconf/confmodule
-        db_purge
 fi
-# (normally) End automatically added section
 
 #DEBHELPER#
 

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git