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

[Julien Valroff]

The following commit has been merged in the master branch:
commit 119c3edfab43f60808ad4de66ae9d60375bc2605
Author: Julien Valroff <julien at kirya.net>
Date:   Tue Feb 14 21:28:37 2012 +0100

    Use maintscript support in dh_installdeb rather than writing out dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a new enough version of dpkg rather than using 'dpkg-maintscript-helper supports' guards, leading to more predictable behaviour on upgrades. Thanks to Colin Watson <cjwatson at ubuntu.com> (Closes: #659717)

diff --git a/debian/changelog b/debian/changelog
index 3871958..e38b3ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ dspam (3.10.2+dfsg-1) unstable; urgency=low
   * Use definitive DEP-5 copyright format uri
   * Add dspam_alias_retraining script to dspam package as example 
   * Refresh and update patches 
+  * Use maintscript support in dh_installdeb rather than writing out
+    dpkg-maintscript-helper commands by hand.  We now simply Pre-Depend on a
+    new enough version of dpkg rather than using 'dpkg-maintscript-helper
+    supports' guards, leading to more predictable behaviour on upgrades.
+    Thanks to Colin Watson <cjwatson at ubuntu.com> (Closes: #659717)
 
  -- Julien Valroff <julien at debian.org>  Sat, 11 Feb 2012 09:15:42 +0100
 
diff --git a/debian/control b/debian/control
index f9413f0..ef9bf3c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Description: Scalable, fast and statistical anti-spam filter
 Package: dspam-webfrontend
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${perl:Depends}, dspam (>= ${source:Version}), ucf (>= 0.28), libgd-gd2-perl | libgd-gd2-noxpm-perl, libgd-graph3d-perl, libhtml-parser-perl
 Suggests: apache2, apache2-suexec (>= 2.2.9-3), libapache2-mod-perl2, libapache2-mod-auth-pam | libapache2-mod-auth-mysql | libapache2-mod-auth-pgsql | libapache2-mod-auth-openid | libapache2-mod-auth-kerb | libapache2-mod-auth-plain | libapache2-mod-auth-radius | libapache2-mod-auth-sys-group, ttf-dejavu-core | ttf-bitstream-vera | ttf-freefont
 Description: Webfrontend for DSPAM anti-spam filter
diff --git a/debian/dspam-webfrontend.postinst b/debian/dspam-webfrontend.postinst
index ca89e05..bfb1086 100644
--- a/debian/dspam-webfrontend.postinst
+++ b/debian/dspam-webfrontend.postinst
@@ -33,12 +33,6 @@ case "$1" in
     ;;
 esac
 
-# Remove old conffiles
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/dspam/dspam-apache.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-    dpkg-maintscript-helper rm_conffile /etc/dspam/dspam-apache2.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/dspam-webfrontend.postrm b/debian/dspam-webfrontend.postrm
index 00bcb49..a2da105 100644
--- a/debian/dspam-webfrontend.postrm
+++ b/debian/dspam-webfrontend.postrm
@@ -37,12 +37,6 @@ case "$1" in
 
 esac
 
-# Remove old conffiles
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/dspam/dspam-apache.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-    dpkg-maintscript-helper rm_conffile /etc/dspam/dspam-apache2.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/dspam-webfrontend.preinst b/debian/dspam-webfrontend.preinst
index efa6255..752faee 100644
--- a/debian/dspam-webfrontend.preinst
+++ b/debian/dspam-webfrontend.preinst
@@ -19,12 +19,6 @@ case "$1" in
     ;;  
 esac
 
-# Remove old conffiles
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/dspam/dspam-apache.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-    dpkg-maintscript-helper rm_conffile /etc/dspam/dspam-apache2.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libdspam7-drv-mysql.postinst b/debian/libdspam7-drv-mysql.postinst
index 9f0502c..f87c22b 100644
--- a/debian/libdspam7-drv-mysql.postinst
+++ b/debian/libdspam7-drv-mysql.postinst
@@ -31,11 +31,6 @@ case "$1" in
     ;;
 esac
 
-# Remove old conffile
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/cron.daily/libdspam7-drv-mysql 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libdspam7-drv-mysql.postrm b/debian/libdspam7-drv-mysql.postrm
index 4264f9a..71be2d4 100644
--- a/debian/libdspam7-drv-mysql.postrm
+++ b/debian/libdspam7-drv-mysql.postrm
@@ -35,11 +35,6 @@ case "$1" in
     ;;
 esac
 
-# Remove olf conffile
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/cron.daily/libdspam7-drv-mysql 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libdspam7-drv-mysql.preinst b/debian/libdspam7-drv-mysql.preinst
deleted file mode 100644
index 1fc37f9..0000000
--- a/debian/libdspam7-drv-mysql.preinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;  
-
-    *)  
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;  
-esac
-
-# Remove old conffile
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/cron.daily/libdspam7-drv-mysql 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libdspam7-drv-sqlite3.postinst b/debian/libdspam7-drv-sqlite3.postinst
index 18df27c..103dc9b 100644
--- a/debian/libdspam7-drv-sqlite3.postinst
+++ b/debian/libdspam7-drv-sqlite3.postinst
@@ -17,11 +17,6 @@ case "$1" in
     ;;
 esac
 
-# Remove old conffile
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/cron.daily/libdspam7-drv-sqlite3 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libdspam7-drv-sqlite3.postrm b/debian/libdspam7-drv-sqlite3.postrm
deleted file mode 100644
index 3ca06b7..0000000
--- a/debian/libdspam7-drv-sqlite3.postrm
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    purge|remove|upgrade|abort-install|abort-upgrade|failed-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# Remove old conffile
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/cron.daily/libdspam7-drv-sqlite3 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libdspam7-drv-sqlite3.preinst b/debian/libdspam7-drv-sqlite3.preinst
deleted file mode 100644
index 3207ecd..0000000
--- a/debian/libdspam7-drv-sqlite3.preinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;  
-
-    *)  
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;  
-esac
-
-# Remove old conffile
-if dpkg-maintscript-helper supports rm_conffile >/dev/null 2>&1; then
-    dpkg-maintscript-helper rm_conffile /etc/cron.daily/libdspam7-drv-sqlite3 3.9.1~rc1+git20110419.29261fb+dfsg-2 -- "$@"
-fi
-
-#DEBHELPER#
-
-exit 0

-- 
Debian packages for the DSPAM anti-spam filter