[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-2-32-ge353040

[Alexander Golovko]

The following commit has been merged in the master branch:
commit cda0a2fe5fb511c04455f2d9c5ab33df7aeaa34e
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Wed Aug 8 13:33:58 2012 +0400

    Make package purging more carefull.
    
    Remove only files, generated by us.
    .dpkg-* files will be removed by dpkg.
    /etc/bacula directory will be removed by dpkg if will be empty.

diff --git a/debian/bacula-common.postrm b/debian/bacula-common.postrm
index ee6341f..698849f 100644
--- a/debian/bacula-common.postrm
+++ b/debian/bacula-common.postrm
@@ -5,8 +5,8 @@ set -e
 
 case "$1" in
 	purge)
+		rm -f /etc/bacula/common_default_passwords
 		rm -rf /run/bacula
-		rm -rf /etc/bacula
 		rm -rf /var/log/bacula
 		rm -rf /var/lib/bacula
 	;;
diff --git a/debian/bacula-console-qt.postrm b/debian/bacula-console-qt.postrm
index 0b24c1c..9f6eb41 100644
--- a/debian/bacula-console-qt.postrm
+++ b/debian/bacula-console-qt.postrm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
   purge)
-    rm -f /etc/bacula/bat.conf /etc/bacula/bat.conf.*
+    rm -f /etc/bacula/bat.conf /etc/bacula/bat.conf.dist
   ;;
 esac
 
diff --git a/debian/bacula-console.postrm b/debian/bacula-console.postrm
index 39ab422..8d8eb32 100644
--- a/debian/bacula-console.postrm
+++ b/debian/bacula-console.postrm
@@ -9,7 +9,7 @@ CFGFILE="bconsole.conf"
 
 case "$1" in
 	purge)
-		rm -f $CFGDIR/$CFGFILE $CFGDIR/$CFGFILE.*
+		rm -f $CFGDIR/$CFGFILE $CFGDIR/$CFGFILE.dist
 	;;
 esac
 
diff --git a/debian/bacula-fd.postrm b/debian/bacula-fd.postrm
index 940b91f..1b74d52 100644
--- a/debian/bacula-fd.postrm
+++ b/debian/bacula-fd.postrm
@@ -20,7 +20,7 @@ set -e
 
 case "$1" in
 	purge)
-		rm -f /etc/bacula/bacula-fd.*
+		rm -f /etc/bacula/bacula-fd.conf /etc/bacula/bacula-fd.conf.dist
 
 		# purge /etc/default/bacula-fd
 		rm -f /etc/default/bacula-fd /etc/default/bacula-fd.ucf-old \
diff --git a/debian/bacula-sd.postrm b/debian/bacula-sd.postrm
index 30c3059..4ce3ca7 100644
--- a/debian/bacula-sd.postrm
+++ b/debian/bacula-sd.postrm
@@ -20,7 +20,7 @@ set -e
 
 case "$1" in
 	purge)
-		rm -f /etc/bacula/bacula-sd.*
+		rm -f /etc/bacula/bacula-sd.conf /etc/bacula/bacula-sd.conf.dist
 
 		# purge /etc/default/bacula-sd
 		rm -f /etc/default/bacula-sd /etc/default/bacula-sd.ucf-old \
diff --git a/debian/bacula-traymonitor.postrm b/debian/bacula-traymonitor.postrm
index d99df06..aa6a086 100644
--- a/debian/bacula-traymonitor.postrm
+++ b/debian/bacula-traymonitor.postrm
@@ -5,7 +5,7 @@ set -e
 
 case "$1" in
     purge)
-        rm -f  /etc/bacula/tray-monitor.conf /etc/bacula/tray-monitor.conf.*
+        rm -f  /etc/bacula/tray-monitor.conf /etc/bacula/tray-monitor.conf.dist
     ;;
 esac
 
diff --git a/debian/changelog b/debian/changelog
index dd5fe3f..8b29498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
     + fix files left after packages purge (thanks to piuparts).
   * debian/bacula-common.preinst:
     + switch from usermod to more debian-policy friendly adduser.
+  * debian/*.postrm:
+    + make package purging more carefull about users files.
 
   [ Bart Swedrowski ]
   * debian/bacula-console.postinst:

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