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

[Julien Valroff]

The following commit has been merged in the master branch:
commit 6833c4b68a738f845ff10146d66371ee9a5460cb
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Jul 8 15:48:21 2011 +0200

    Remove useless calls to ucf in libdspam7-drv-{mysql,pgsql}.postinst scripts

diff --git a/debian/changelog b/debian/changelog
index 602d535..0227f99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,11 +9,13 @@ dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
     + Clean .install files
   * Move default.prefs to dspam-webfrontend (from dspam core package)
   * Remove useless 001_drivers-in-usr_lib_dspam patch
+  * Remove useless calls to ucf in libdspam7-drv-{mysql,pgsql}.postinst
+    scripts
 
   [ Thomas Preud'homme ]
   * Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
 
- -- Julien Valroff <julien at debian.org>  Fri, 08 Jul 2011 13:24:41 +0200
+ -- Julien Valroff <julien at debian.org>  Fri, 08 Jul 2011 15:47:48 +0200
 
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 98979a5..15a3a53 100644
--- a/debian/control
+++ b/debian/control
@@ -97,7 +97,7 @@ Description: Hash backend for DSPAM anti-spam filter
 
 Package: libdspam7-drv-pgsql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), postgresql-client
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, postgresql-client
 Recommends: postgresql
 Provides: libdspam7-drv
 Description: PostgreSQL backend for DSPAM anti-spam filter
@@ -112,7 +112,7 @@ Description: PostgreSQL backend for DSPAM anti-spam filter
 
 Package: libdspam7-drv-mysql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), mysql-client
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, mysql-client
 Recommends: mysql-server
 Provides: libdspam7-drv
 Description: MySQL backend for DSPAM anti-spam filter
diff --git a/debian/libdspam7-drv-mysql.postrm b/debian/libdspam7-drv-mysql.postrm
index 723af00..d754fd6 100644
--- a/debian/libdspam7-drv-mysql.postrm
+++ b/debian/libdspam7-drv-mysql.postrm
@@ -13,17 +13,6 @@ fi
 case "$1" in
     purge)
         dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/mysql.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/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 e07e326..2744795 100644
--- a/debian/libdspam7-drv-pgsql.postrm
+++ b/debian/libdspam7-drv-pgsql.postrm
@@ -13,17 +13,6 @@ fi
 case "$1" in
     purge)
         dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/pgsql.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/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