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

[Julien Valroff]

The following commit has been merged in the master branch:
commit cc8cdc3fd0628a294118863530baa37b6d559264
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jul 2 08:24:33 2011 +0200

    Move default.prefs to dspam-webfrontend (from dspam core package)

diff --git a/debian/changelog b/debian/changelog
index 32983d7..ceb1bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,13 +3,16 @@ dspam (3.9.1~rc1+git20110514.347379b+dfsg-2) unstable; urgency=low
   [ Julien Valroff ]
   * Ensures system user is actually locked on purge, and unlocked in case
     the package is reinstalled
-  * Demote various MDA's from Depends to Recommends 
-  * Move the hash driver to as dedicated package
+  * Demote various MDA's from Depends to Recommends
+  * Prepare multiarch support:
+    + Move the hash driver to as dedicated package
+    + Clean .install files
+  * Move default.prefs to dspam-webfrontend (from dspam core package)
 
   [ Thomas Preud'homme ]
   * Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
 
- -- Julien Valroff <julien at debian.org>  Fri, 01 Jul 2011 22:17:40 +0200
+ -- Julien Valroff <julien at debian.org>  Sat, 02 Jul 2011 08:23:09 +0200
 
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bebd9ea..bfcb261 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,8 @@ 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 a5d40aa..d1ea273 100644
--- a/debian/dspam-webfrontend.install
+++ b/debian/dspam-webfrontend.install
@@ -25,3 +25,4 @@ 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.install b/debian/dspam.install
index db6ff33..a6c31b9 100644
--- a/debian/dspam.install
+++ b/debian/dspam.install
@@ -17,4 +17,3 @@ 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