diff -Nru dspam-3.10.1+dfsg/debian/changelog dspam-3.10.1+dfsg/debian/changelog --- dspam-3.10.1+dfsg/debian/changelog 2011-11-24 07:25:40.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/changelog 2012-02-13 10:39:36.000000000 +0000 @@ -1,3 +1,12 @@ +dspam (3.10.1+dfsg-3ubuntu1) precise; urgency=low + + * 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. + + -- Colin Watson Mon, 13 Feb 2012 10:39:34 +0000 + dspam (3.10.1+dfsg-3build1) precise; urgency=low * Rebuild for libmysqlclient transition diff -Nru dspam-3.10.1+dfsg/debian/control dspam-3.10.1+dfsg/debian/control --- dspam-3.10.1+dfsg/debian/control 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/control 2012-02-13 10:39:38.000000000 +0000 @@ -1,7 +1,8 @@ Source: dspam Section: mail Priority: optional -Maintainer: Debian DSPAM Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian DSPAM Maintainers Uploaders: Julien Valroff Build-Depends: debhelper (>= 8.1.3), dh-autoreconf, @@ -35,6 +36,7 @@ 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 -Nru dspam-3.10.1+dfsg/debian/dspam-webfrontend.maintscript dspam-3.10.1+dfsg/debian/dspam-webfrontend.maintscript --- dspam-3.10.1+dfsg/debian/dspam-webfrontend.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/dspam-webfrontend.maintscript 2012-02-13 10:34:37.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/dspam/dspam-apache.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 +rm_conffile /etc/dspam/dspam-apache2.conf 3.9.1~rc1+git20110419.29261fb+dfsg-2 diff -Nru dspam-3.10.1+dfsg/debian/dspam-webfrontend.postinst dspam-3.10.1+dfsg/debian/dspam-webfrontend.postinst --- dspam-3.10.1+dfsg/debian/dspam-webfrontend.postinst 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/dspam-webfrontend.postinst 2012-02-13 10:34:46.000000000 +0000 @@ -33,12 +33,6 @@ ;; 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 -Nru dspam-3.10.1+dfsg/debian/dspam-webfrontend.postrm dspam-3.10.1+dfsg/debian/dspam-webfrontend.postrm --- dspam-3.10.1+dfsg/debian/dspam-webfrontend.postrm 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/dspam-webfrontend.postrm 2012-02-13 10:34:49.000000000 +0000 @@ -37,12 +37,6 @@ 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 -Nru dspam-3.10.1+dfsg/debian/dspam-webfrontend.preinst dspam-3.10.1+dfsg/debian/dspam-webfrontend.preinst --- dspam-3.10.1+dfsg/debian/dspam-webfrontend.preinst 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/dspam-webfrontend.preinst 2012-02-13 10:34:44.000000000 +0000 @@ -19,12 +19,6 @@ ;; 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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.maintscript dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.maintscript --- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.maintscript 2012-02-13 10:35:48.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/cron.daily/libdspam7-drv-mysql 3.9.1~rc1+git20110419.29261fb+dfsg-2 diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst --- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postinst 2012-02-13 10:36:00.000000000 +0000 @@ -31,11 +31,6 @@ ;; 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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postrm dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postrm --- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postrm 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.postrm 2012-02-13 10:36:03.000000000 +0000 @@ -35,11 +35,6 @@ ;; 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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.preinst dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.preinst --- dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.preinst 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-mysql.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.maintscript dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.maintscript --- dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.maintscript 2012-02-13 10:37:53.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/cron.daily/libdspam7-drv-sqlite3 3.9.1~rc1+git20110419.29261fb+dfsg-2 diff -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postinst dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postinst --- dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postinst 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postinst 2012-02-13 10:38:15.000000000 +0000 @@ -17,11 +17,6 @@ ;; 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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postrm dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postrm --- dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postrm 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -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 -Nru dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.preinst dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.preinst --- dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.preinst 2011-08-21 19:54:29.000000000 +0000 +++ dspam-3.10.1+dfsg/debian/libdspam7-drv-sqlite3.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -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