[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-71-gbbe3dd6

[Alexander Golovko]

The following commit has been merged in the master branch:
commit a0f66ca48a3423ede76eed6e1dff96fb60b0053e
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Wed May 23 00:05:59 2012 +0400

    remove all useless dbconfig-common statements
    
    There are no variables need for dbconfig-common in prerm and postrm scripts
    We don't need to call db_purge, dbconfig postrm script dbc_go already do all
    work

diff --git a/debian/bacula-director-mysql.postrm b/debian/bacula-director-mysql.postrm
index 72f8699..edad33d 100644
--- a/debian/bacula-director-mysql.postrm
+++ b/debian/bacula-director-mysql.postrm
@@ -6,10 +6,6 @@
 if [ -f /usr/share/debconf/confmodule ]; then
     . /usr/share/debconf/confmodule
     db_version 2.0
-
-    dbc_first_version=1.38.9-3
-    dbc_dbuser=bacula
-    dbc_dbname=bacula
 fi
 
 if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
@@ -38,9 +34,6 @@ CONFFILE=/etc/bacula/bacula-dir.conf
 case "$1" in
 	purge)
 		rm -f $CONFFILE $CONFFILE.dist
-		# Drop Bacula's user privileges? Can't do	
-		# Potentially, drop DB ... Can't do?
-		db_purge
 
 		# purge /etc/default/bacula-dir
 		rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
diff --git a/debian/bacula-director-mysql.prerm b/debian/bacula-director-mysql.prerm
index 454080d..fe6b706 100644
--- a/debian/bacula-director-mysql.prerm
+++ b/debian/bacula-director-mysql.prerm
@@ -5,11 +5,6 @@
 
 . /usr/share/debconf/confmodule
 
-dbc_first_version=1.38.9-3
-dbc_dbuser=bacula
-dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
 if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
   . /usr/share/dbconfig-common/dpkg/prerm.mysql
   dbc_go bacula-director-mysql $@
diff --git a/debian/bacula-director-pgsql.postrm b/debian/bacula-director-pgsql.postrm
index ca327de..bc12d16 100644
--- a/debian/bacula-director-pgsql.postrm
+++ b/debian/bacula-director-pgsql.postrm
@@ -6,10 +6,6 @@
 if [ -f /usr/share/debconf/confmodule ]; then
 	. /usr/share/debconf/confmodule
         db_version 2.0
-
-        dbc_first_version=1.38.9-2
-        dbc_dbuser=bacula
-        dbc_dbname=bacula
 fi
 
 if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql  ]; then
@@ -42,8 +38,6 @@ case "$1" in
 	purge)
 		rm -f $CONFFILE $CONFFILE.dist $AUTHFILE
 
-		db_purge
-
     # purging /etc/default/bacula-dir
 		rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
 			/etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
diff --git a/debian/bacula-director-pgsql.prerm b/debian/bacula-director-pgsql.prerm
index d46ef4c..3080bc3 100644
--- a/debian/bacula-director-pgsql.prerm
+++ b/debian/bacula-director-pgsql.prerm
@@ -7,11 +7,6 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-dbc_first_version=1.38.9-2
-dbc_dbuser=bacula
-dbc_dbname=bacula
-
-# source dbconfig-common shell library, and call the hook function
 if [ -f /usr/share/dbconfig-common/dpkg/prerm.pgsql ]; then
   . /usr/share/dbconfig-common/dpkg/prerm.pgsql
   dbc_go bacula-director-pgsql $@
diff --git a/debian/bacula-director-sqlite3.postrm b/debian/bacula-director-sqlite3.postrm
index a0a9902..c7873ab 100644
--- a/debian/bacula-director-sqlite3.postrm
+++ b/debian/bacula-director-sqlite3.postrm
@@ -26,7 +26,6 @@ CONFFILE=/etc/bacula/bacula-dir.conf
 case "$1" in
 	purge)
 		rm -f $CONFFILE $CONFFILE.dist
-		db_purge
 
     # purge /etc/default/bacula-dir
 		rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \

-- 
Bacula, a network backup, recovery and verification program