[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.1+dfsg-2-2-gc828ca5

[Julien Valroff]

The following commit has been merged in the master branch:
commit c828ca512b72aff56cea30750aa8702873873600
Author: Julien Valroff <julien at kirya.net>
Date:   Sun Aug 21 21:54:29 2011 +0200

    Revert "Remove useless calls to ucf in libdspam7-drv-{mysql,pgsql}.postinst scripts"
    
    This reverts commit 6833c4b68a738f845ff10146d66371ee9a5460cb.

diff --git a/debian/changelog b/debian/changelog
index 180589c..917929f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 dspam (3.10.1+dfsg-3) unstable; urgency=low
 
   * Fix Apache configuration example (Closes: #638289) 
+  * Add again ucf calls in libdspam7-drv-{mysql,pgsql}.postinst scripts: they
+    are actually needed to clean files registered through dbconfig-common 
 
- -- Julien Valroff <julien at debian.org>  Thu, 18 Aug 2011 15:51:45 +0200
+ -- Julien Valroff <julien at debian.org>  Sun, 21 Aug 2011 21:53:32 +0200
 
 dspam (3.10.1+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 306e181..f9413f0 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Description: Hash backend for DSPAM anti-spam filter
 Package: libdspam7-drv-pgsql
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, postgresql-client
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), postgresql-client
 Recommends: postgresql
 Provides: libdspam7-drv
 Multi-Arch: ${misc:Multi-Arch}
@@ -119,7 +119,7 @@ Description: PostgreSQL backend for DSPAM anti-spam filter
 Package: libdspam7-drv-mysql
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, mysql-client
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), mysql-client
 Recommends: mysql-server
 Provides: libdspam7-drv
 Multi-Arch: ${misc:Multi-Arch}
diff --git a/debian/libdspam7-drv-mysql.postrm b/debian/libdspam7-drv-mysql.postrm
index d754fd6..4264f9a 100644
--- a/debian/libdspam7-drv-mysql.postrm
+++ b/debian/libdspam7-drv-mysql.postrm
@@ -13,6 +13,17 @@ fi
 case "$1" in
     purge)
         dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/mysql.conf || true
+
+        # Remove files registered with ucf (through dbconfig-common).
+        for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old .ucf-dist; do
+            rm -f /etc/dspam/dspam.d/mysql.conf$ext
+        done
+
+        rm -f /etc/dspam/dspam.d/mysql.conf
+
+        if [ -x /usr/bin/ucf ]; then
+            ucf --purge /etc/dspam/dspam.d/mysql.conf
+        fi
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/libdspam7-drv-pgsql.postrm b/debian/libdspam7-drv-pgsql.postrm
index 2744795..e210470 100644
--- a/debian/libdspam7-drv-pgsql.postrm
+++ b/debian/libdspam7-drv-pgsql.postrm
@@ -13,6 +13,17 @@ fi
 case "$1" in
     purge)
         dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/pgsql.conf || true
+
+        # Remove files registered with ucf (through dbconfig-common).
+        for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist .ucf-old .ucf-dist; do
+            rm -f /etc/dspam/dspam.d/pgsql.conf$ext
+        done
+
+        rm -f /etc/dspam/dspam.d/pgsql.conf
+        
+        if [ -x /usr/bin/ucf ]; then
+            ucf --purge /etc/dspam/dspam.d/pgsql.conf
+        fi
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

-- 
Debian packages for the DSPAM anti-spam filter