[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-23-gf26e479

[Julien Valroff]

The following commit has been merged in the master branch:
commit f26e479d49e2f62b5a4e72140ec6f28e2ecdf17a
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jul 2 13:25:03 2011 +0200

    Fix maintainer scripts

diff --git a/debian/dspam-webfrontend.postinst b/debian/dspam-webfrontend.postinst
index f2334cb..d1d3eed 100644
--- a/debian/dspam-webfrontend.postinst
+++ b/debian/dspam-webfrontend.postinst
@@ -18,11 +18,14 @@ case "$1" in
         ucf /usr/share/dspam/configure.pl /etc/dspam/webfrontend.conf
         ucfr dspam-webfrontend /etc/dspam/webfrontend.conf
 
-        if ! dpkg-statoverride --list /etc/dspam/webfrontend.conf >/dev/null
-        then
-            dpkg-statoverride --update --add dspam dspam 0644 \
-                              /etc/dspam/webfrontend.conf
-        fi
+        for i in /etc/dspam/default.prefs \
+                 /etc/dspam/webfrontend.conf
+        do
+            if ! dpkg-statoverride --list $i >/dev/null
+            then
+                dpkg-statoverride --update --add dspam dspam 0644 $i
+            fi
+        done
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/dspam-webfrontend.postrm b/debian/dspam-webfrontend.postrm
index c300c9c..00bcb49 100644
--- a/debian/dspam-webfrontend.postrm
+++ b/debian/dspam-webfrontend.postrm
@@ -12,21 +12,20 @@ case "$1" in
         do
             dpkg-statoverride --quiet --remove $i || true
         done
-       	;;
+    ;;
 
     purge)
-        # remove obsolete conffile:
-        rm -f /etc/dspam/dspam-apache.conf || true
-
         # Remove files registered with ucf.
         for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old .ucf-dist; do
-          rm -f /etc/dspam/webfrontend.conf$ext
+            rm -f /etc/dspam/webfrontend.conf$ext
         done
         rm -f /etc/dspam/webfrontend.conf
         if [ -x /usr/bin/ucf ]; then
-          ucf --purge /etc/dspam/webfrontend.conf
+            ucf --purge /etc/dspam/webfrontend.conf
         fi
 
+        dpkg-statoverride --quiet --remove /etc/dspam/default.prefs || true
+        dpkg-statoverride --quiet --remove /etc/dspam/webfrontend.conf || true
     ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/dspam.postinst b/debian/dspam.postinst
index 8ce2346..0d850ba 100644
--- a/debian/dspam.postinst
+++ b/debian/dspam.postinst
@@ -42,11 +42,6 @@ set_dspam_perms() {
         fi
     done
 
-    if ! dpkg-statoverride --list /etc/dspam/default.prefs >/dev/null
-    then
-      dpkg-statoverride --update --add dspam dspam 0644 /etc/dspam/default.prefs
-    fi
-
     if ! dpkg-statoverride --list /var/log/dspam >/dev/null
     then
       dpkg-statoverride --update --add dspam dspam 0755 /var/log/dspam
diff --git a/debian/dspam.postrm b/debian/dspam.postrm
index 5326abe..265f16b 100644
--- a/debian/dspam.postrm
+++ b/debian/dspam.postrm
@@ -20,7 +20,6 @@ case "$1" in
             /var/spool/dspam/data \
             /var/spool/dspam/opt-in \
             /var/spool/dspam/opt-out \
-            /etc/dspam/default.prefs \
             /var/log/dspam \
         ; do
             dpkg-statoverride --quiet --remove $i || true

-- 
Debian packages for the DSPAM anti-spam filter