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

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit 3a35db8461b3906d6393c52db38fcfbc75c52cca
Author: Thomas Preud'homme <robotux at celest.fr>
Date:   Tue Jan 8 11:40:36 2013 +0100

    Disable multi-arch
    
    Disable multi-arch since it create many problems with regards to the
    handling of shared resources when a package is installed for several
    architectures.

diff --git a/debian/changelog b/debian/changelog
index 76152f3..7d8a748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dspam (3.10.2+dfsg-4) unstable; urgency=low
+
+  * Disable multi-arch since it create many problems with regards to the
+    handling of shared resources when a package is installed for several
+    architectures (Closes: #695275).
+
+ -- Thomas Preud'homme <robotux at debian.org>  Tue, 08 Jan 2013 18:50:26 +0100
+
 dspam (3.10.2+dfsg-3) unstable; urgency=low
 
   * Only lock dspam user account when the last libdspam7 package is purged
diff --git a/debian/control b/debian/control
index 2678414..1f8dea0 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,6 @@ Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, adduser
 Suggests: libdspam7-drv (= ${binary:Version})
-Multi-Arch: ${misc:Multi-Arch}
 Description: Core message processing and classification functionality for DSPAM
  DSPAM is a dedicated statistical filter with minimal resources. It includes
  many new algorithms to fight against spam including:
@@ -89,7 +88,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version})
 Replaces: dspam (<= 3.9.1~rc1+git20110514.347379b+dfsg-1)
 Breaks: dspam (<= 3.9.1~rc1+git20110514.347379b+dfsg-1)
 Provides: libdspam7-drv
-Multi-Arch: ${misc:Multi-Arch}
 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:
@@ -106,7 +104,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), postgresql-client
 Recommends: postgresql
 Provides: libdspam7-drv
-Multi-Arch: ${misc:Multi-Arch}
 Description: PostgreSQL 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:
@@ -123,7 +120,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, ucf (>= 0.28), mysql-client
 Recommends: mysql-server
 Provides: libdspam7-drv
-Multi-Arch: ${misc:Multi-Arch}
 Description: MySQL 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:
@@ -139,7 +135,6 @@ Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, sqlite3, libdspam7 (= ${binary:Version})
 Provides: libdspam7-drv
-Multi-Arch: ${misc:Multi-Arch}
 Description: sqlite3 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:
@@ -186,7 +181,6 @@ Depends: ${misc:Depends}, libdspam7 (= ${binary:Version})
 Recommends: libdspam7-drv-hash (= ${binary:Version}), libdspam7-drv-mysql (= ${binary:Version}), libdspam7-drv-pgsql (= ${binary:Version}), libdspam7-drv-sqlite3 (= ${binary:Version})
 Suggests: libc-dbg
 Priority: extra
-Multi-Arch: ${misc:Multi-Arch}
 Description: debugging symbols for DSPAM related libraries
  DSPAM is a dedicated statistical filter with minimal resources. It includes
  many new algorithms to fight against spam including:
diff --git a/debian/libdspam7.postrm b/debian/libdspam7.postrm
index ae14b30..efad3a9 100644
--- a/debian/libdspam7.postrm
+++ b/debian/libdspam7.postrm
@@ -1,16 +1,9 @@
 #!/bin/sh
 set -e
 
-# Locks dspam system account on purge of last package
+# Locks dspam system account on purge
 if [ "$1" = "purge" ] ; then
-    # Multi-arch was added in dpkg in the same version as the db:Status-Abbrev
-    # virtual field was added to dpkg-query. Hence, either this bug cannot be
-    # encountered, or db:Status-Abbrev virtual field is available in dpkg-query.
-    if ! dpkg --assert-multi-arch ||
-       ! dpkg-query '-f=${db:Status-Abbrev}\n' -W libdspam7 | grep -vE '(.n|pc)' >/dev/null
-    then
-        usermod -L -e 1 dspam > /dev/null || true
-    fi
+    usermod -L -e 1 dspam > /dev/null || true
 fi
 
 #DEBHELPER#

-- 
Debian packages for the DSPAM anti-spam filter