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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 85d99ef87085872fbdca7cb098362ebdc2e8cd18
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Wed Aug 1 16:12:07 2012 +0400

    fix files left after packages purge.
    
    Fix bat.conf and tray-monitor.conf purging

diff --git a/debian/bacula-traymonitor.postrm b/debian/bacula-console-qt.postrm
similarity index 62%
copy from debian/bacula-traymonitor.postrm
copy to debian/bacula-console-qt.postrm
index 219fa81..0b24c1c 100644
--- a/debian/bacula-traymonitor.postrm
+++ b/debian/bacula-console-qt.postrm
@@ -3,14 +3,10 @@
 set -e
 
 
-CFGDIR=/etc/bacula
-CFGFILE="tray-monitor.conf"
-
-
 case "$1" in
-    purge)
-        rm -f $CFGDIR/$CFGFILE.*
-    ;;
+  purge)
+    rm -f /etc/bacula/bat.conf /etc/bacula/bat.conf.*
+  ;;
 esac
 
 
diff --git a/debian/bacula-traymonitor.postrm b/debian/bacula-traymonitor.postrm
index 219fa81..d99df06 100644
--- a/debian/bacula-traymonitor.postrm
+++ b/debian/bacula-traymonitor.postrm
@@ -3,13 +3,9 @@
 set -e
 
 
-CFGDIR=/etc/bacula
-CFGFILE="tray-monitor.conf"
-
-
 case "$1" in
     purge)
-        rm -f $CFGDIR/$CFGFILE.*
+        rm -f  /etc/bacula/tray-monitor.conf /etc/bacula/tray-monitor.conf.*
     ;;
 esac
 
diff --git a/debian/changelog b/debian/changelog
index eb695a7..41b7764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bacula (5.2.6+dfsg-3) unstable; urgency=high
+bacuqla (5.2.6+dfsg-3) unstable; urgency=high
 
   [ Alexander Golovko ]
   * debian/bacula-common-db.install.in, debian/bacula-common-db.links.in,
@@ -31,6 +31,8 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
       bacula-director database type, fix purging after this (Closes: #680051).
   * debian/bacula-console.postrm:
     + fix files left after bacula-console package purge (Closes: #682733).
+  * debian/bacula-console-qt.postrm, debian/bacula-traymonitor.postrm:
+    + fix files left after packages purge (thanks to piuparts).
 
   [ Bart Swedrowski ]
   * debian/bacula-console.postinst:

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