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

[Julien Valroff]

The following commit has been merged in the multiarch branch:
commit 3b866189cbe1fa4a580304a0c3dba86d68a3c1af
Author: Julien Valroff <julien at kirya.net>
Date:   Wed Jun 29 20:39:39 2011 +0200

    Add libdspam7-drv-hash package - for now, conffile is not moved

diff --git a/debian/control b/debian/control
index 971db48..0306030 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-dspam/dspam.git;a=summary
 Package: dspam
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, lsb-base (>= 3.0-6)
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}, lsb-base (>= 3.0-6), libdspam7-drv-hash (= ${source:Version}) | libdspam7-drv-mysql (= ${source:Version}) | libdspam7-drv-pgsql (= ${source:Version}) | libdspam7-drv-sqlite3 (= ${source:Version})
 Recommends: procmail | maildrop | courier-maildrop | sensible-mda, dspam-doc
 Suggests: clamav-daemon, dspam-webfrontend
 Multi-Arch: same
@@ -81,6 +81,22 @@ Description: Development headers for libdspam
  .
  This package contains the development headers for libdspam.
 
+Package: libdspam7-drv-hash
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version})
+Provides: libdspam7-drv
+Multi-Arch: same
+Description: Hash backend for DSPAM anti-spam filter
+ DSPAM is a dedicated statistical filter with minimal resources. It includes
+ many new algorithms to fight against spam including:
+  * Concept Identification
+  * Message Inoculation
+  * Advanced de-obfuscation techniques
+  * Bayesian Noise Reduction
+ .
+ This package contains the hash backend.
+
 Package: libdspam7-drv-pgsql
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/dspam.install b/debian/dspam.install
index f3946e4..db6ff33 100644
--- a/debian/dspam.install
+++ b/debian/dspam.install
@@ -15,8 +15,6 @@ usr/bin/dspam_merge
 usr/bin/dspam_stats
 usr/bin/dspam_train
 usr/bin/dspam
-usr/lib/*/dspam/libhash_drv.so*
 src/extlookup.conf                              etc/dspam/dspam.d/
-src/hash.conf                                   etc/dspam/dspam.d/
 txt/*.txt                                       etc/dspam/txt/
 webui/cgi-bin/default.prefs                     etc/dspam/
diff --git a/debian/dspam.postinst b/debian/dspam.postinst
index 6b44945..8ce2346 100644
--- a/debian/dspam.postinst
+++ b/debian/dspam.postinst
@@ -5,10 +5,10 @@ set_dspam_perms() {
 
     # If you add any other permission/ownership tweaks here, then
     # remember to add a corresponding remove operation to the
-    # dspam.postinst
+    # dspam.postrm
 
     # Database password info is contained in dspam.conf and other conffiles
-    for config_file in dspam.conf dspam.d/hash.conf dspam.d/extlookup.conf ; do
+    for config_file in dspam.conf dspam.d/extlookup.conf ; do
         if ! dpkg-statoverride --list /etc/dspam/$config_file >/dev/null
         then
             dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/$config_file
diff --git a/debian/dspam.postrm b/debian/dspam.postrm
index ee1aff2..5326abe 100644
--- a/debian/dspam.postrm
+++ b/debian/dspam.postrm
@@ -5,7 +5,6 @@ case "$1" in
     purge)
         for i in \
             /etc/dspam/dspam.conf \
-            /etc/dspam/dspam.d/hash.conf \
             /etc/dspam/dspam.d/extlookup.conf \
             /usr/bin/dspam \
             /usr/bin/dspamc \
diff --git a/debian/libdspam7-drv-hash.install b/debian/libdspam7-drv-hash.install
new file mode 100644
index 0000000..ec23bdd
--- /dev/null
+++ b/debian/libdspam7-drv-hash.install
@@ -0,0 +1,2 @@
+usr/lib/*/dspam/libhash_drv.so*
+src/hash.conf                                   etc/dspam/dspam.d/
diff --git a/debian/libdspam7-drv-hash.postinst b/debian/libdspam7-drv-hash.postinst
new file mode 100644
index 0000000..d747345
--- /dev/null
+++ b/debian/libdspam7-drv-hash.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    configure)
+        if ! dpkg-statoverride --list /etc/dspam/dspam.d/hash.conf >/dev/null
+        then
+            dpkg-statoverride --update --add dspam dspam 0640 /etc/dspam/dspam.d/hash.conf
+        fi
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libdspam7-drv-hash.postrm b/debian/libdspam7-drv-hash.postrm
new file mode 100644
index 0000000..dd8f178
--- /dev/null
+++ b/debian/libdspam7-drv-hash.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+    purge)
+        dpkg-statoverride --quiet --remove /etc/dspam/dspam.d/hash.conf || true
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 57a61ee..84a35d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ override_dh_auto_configure:
 	./debian/split-config.sh
 
 override_dh_makeshlibs:
-	dh_makeshlibs -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-sqlite3 -Ndspam
+	dh_makeshlibs -Nlibdspam7-drv-hash -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-sqlite3
 
 override_dh_strip:
 	dh_strip --dbg-package=dspam-dbg

-- 
Debian packages for the DSPAM anti-spam filter