[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
julien at kirya.net
Sat Jul 9 11:55:40 UTC 2011
The following commit has been merged in the master branch:
commit a70db752aca17e3f87bcba97eb517728a2b9f043
Author: Julien Valroff <julien at kirya.net>
Date: Fri Jul 8 15:50:44 2011 +0200
Revert "Move default.prefs to dspam-webfrontend (from dspam core package)"
This reverts commit cc8cdc3fd0628a294118863530baa37b6d559264.
Having default.prefs in dspam-webfrontend could cause issue if
dspam-webfrontend is installed after DSPAM is already configured by the
sysadmin: default preferences could be overridden
diff --git a/debian/changelog b/debian/changelog
index 0227f99..1431580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
* Prepare multiarch support:
+ Move the hash driver to as dedicated package
+ 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
diff --git a/debian/control b/debian/control
index 15a3a53..926dab6 100644
--- a/debian/control
+++ b/debian/control
@@ -35,8 +35,6 @@ Description: Scalable, fast and statistical anti-spam filter
Package: dspam-webfrontend
Priority: extra
Architecture: all
-Replaces: dspam (<= 3.9.1~rc1+git20110514.347379b+dfsg-1)
-Breaks: dspam (<= 3.9.1~rc1+git20110514.347379b+dfsg-1)
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.install b/debian/dspam-webfrontend.install
index d1ea273..a5d40aa 100644
--- a/debian/dspam-webfrontend.install
+++ b/debian/dspam-webfrontend.install
@@ -25,4 +25,3 @@ webui/cgi-bin/templates/strings.pl etc/dspam/templates
webui/htdocs/base.css usr/share/dspam
webui/htdocs/dspam.js usr/share/dspam
webui/htdocs/dspam-logo-small.gif usr/share/dspam
-webui/cgi-bin/default.prefs etc/dspam/
diff --git a/debian/dspam-webfrontend.postinst b/debian/dspam-webfrontend.postinst
index d1d3eed..ca89e05 100644
--- a/debian/dspam-webfrontend.postinst
+++ b/debian/dspam-webfrontend.postinst
@@ -18,14 +18,10 @@ case "$1" in
ucf /usr/share/dspam/configure.pl /etc/dspam/webfrontend.conf
ucfr dspam-webfrontend /etc/dspam/webfrontend.conf
- 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
+ if ! dpkg-statoverride --list /etc/dspam/webfrontend.conf >/dev/null
+ then
+ dpkg-statoverride --update --add dspam dspam 0644 /etc/dspam/webfrontend.conf
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/dspam.install b/debian/dspam.install
index a6c31b9..db6ff33 100644
--- a/debian/dspam.install
+++ b/debian/dspam.install
@@ -17,3 +17,4 @@ usr/bin/dspam_train
usr/bin/dspam
src/extlookup.conf etc/dspam/dspam.d/
txt/*.txt etc/dspam/txt/
+webui/cgi-bin/default.prefs etc/dspam/
--
Debian packages for the DSPAM anti-spam filter
More information about the Pkg-dspam-commits
mailing list