[Pkg-mysql-commits] [mariadb-5.5] 02/03: Fix Lintian errors. Make template refrences explicit.

[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 ba8f2167301d893d98eac22062d209d7f08165e3
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sat Apr 26 15:59:03 2014 +0300

    Fix Lintian errors. Make template refrences explicit.
---
 debian/mariadb-server-5.5.config  |  2 +-
 debian/mariadb-server-5.5.postrm  |  4 ++--
 debian/mariadb-server-5.5.preinst | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/mariadb-server-5.5.config b/debian/mariadb-server-5.5.config
index 424982a..a4c65f3 100644
--- a/debian/mariadb-server-5.5.config
+++ b/debian/mariadb-server-5.5.config
@@ -11,7 +11,7 @@ CNF=/etc/mysql/my.cnf
 
 # Beware that there are two ypwhich one of them needs the 2>/dev/null!
 if test -n "`which ypwhich 2>/dev/null`"  &&  ypwhich >/dev/null 2>&1; then
-  db_input high mysql-server-5.1/nis_warning || true
+  db_input high mysql-server-5.5/nis_warning || true
   db_go
 fi
 
diff --git a/debian/mariadb-server-5.5.postrm b/debian/mariadb-server-5.5.postrm
index 1f79890..101067c 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.1/postrm_remove_databases || true
+  db_input high mysql-server-5.5/postrm_remove_databases || true
   db_go || true
-  db_get mysql-server-5.1/postrm_remove_databases || true
+  db_get mysql-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!
diff --git a/debian/mariadb-server-5.5.preinst b/debian/mariadb-server-5.5.preinst
index 209d0c0..7c36b43 100644
--- a/debian/mariadb-server-5.5.preinst
+++ b/debian/mariadb-server-5.5.preinst
@@ -46,7 +46,7 @@ stop_server() {
 
 ################################ main() ##########################
 
-this_version=5.5
+
 
 # Show warning if old data exists
 if [ -d $DATADIR ]; then
@@ -78,22 +78,22 @@ fi
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do
   found_version=`echo $i | sed 's/.*debian-\([0-9\.]\+\).flag/\1/'`
-  if dpkg --compare-versions "$this_version" '<<' "$found_version"; then
+  if dpkg --compare-versions "5.5" '<<' "$found_version"; then
     show_downgrade_warning=1
     break;
   fi
 done
 if [ "$show_downgrade_warning" = 1 ]; then
-  db_fset mariadb-server-$this_version/really_downgrade seen false || true
-  db_input medium mariadb-server-$this_version/really_downgrade || true
+  db_fset mariadb-server-5.5/really_downgrade seen false || true
+  db_input medium mariadb-server-5.5/really_downgrade || true
   db_go
-  db_get mariadb-server-$this_version/really_downgrade || true
+  db_get mariadb-server-5.5/really_downgrade || true
   if [ "$RET" = "true" ]; then
     rm -f $DATADIR/debian-*.flag
-    touch $DATADIR/debian-$this_version.flag
+    touch $DATADIR/debian-5.5.flag
   else
-    echo "Aborting downgrade from (at least) $found_version to $this_version." 1>&2
-    echo "If are sure you want to downgrade to $this_version, remove the file" 1>&2
+    echo "Aborting downgrade from (at least) $found_version to 5.5." 1>&2
+    echo "If are sure you want to downgrade to 5.5, remove the file" 1>&2
     echo "$DATADIR/debian-*.flag and try installing again." 1>&2
     db_stop
     exit 1

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