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

Julien Valroff julien at kirya.net
Sat Jul 30 07:50:53 UTC 2011 

The following commit has been merged in the master branch:
commit 92432410091d3d1f30aa12ae0279299e081a8c13
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jul 30 08:38:02 2011 +0200

    Add multiarch support

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index ffed291..07443ae 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -18,5 +18,3 @@ TODO list for DSPAM debian packages
   as well as adding the username to /etc/dspam/admins
 
 * Add support for /run (see commit 69045692a5bf34988449ab9ebeb431f7951957c4)
-
-* Add multiarch support (mainly merge branch multiarch)
diff --git a/debian/changelog b/debian/changelog
index 3ef8b33..e91c41f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,11 +11,15 @@ dspam (3.9.1~rc1+git20110729.ae3fad4+dfsg-1) unstable; urgency=low
   * Remove useless calls to ucf in libdspam7-drv-{mysql,pgsql}.postinst
     scripts
   * New upstream snapshot
+  * Update copyright information following to upstream license switch from
+    GPL-2 to AGPL-3+
+  * Drop patches merged upstream
+  * Add multiarch support
 
   [ Thomas Preud'homme ]
   * Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
 
- -- Julien Valroff <julien at debian.org>  Sat, 30 Jul 2011 07:45:09 +0200
+ -- Julien Valroff <julien at debian.org>  Sat, 30 Jul 2011 08:23:43 +0200
 
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 926dab6..0bde5f8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: mail
 Priority: optional
 Maintainer: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
 Uploaders: Julien Valroff <julien at debian.org>
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 8.1.3),
                dh-autoreconf,
                libtool,
                automake,
@@ -51,8 +51,10 @@ Description: Webfrontend for DSPAM anti-spam filter
 Package: libdspam7
 Section: libs
 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:
@@ -66,7 +68,9 @@ Description: Core message processing and classification functionality for DSPAM
 Package: libdspam7-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, libdspam7 (= ${binary:Version})
+Multi-Arch: ${misc:Multi-Arch}
 Description: Development headers for libdspam
  DSPAM is a dedicated statistical filter with minimal resources. It includes
  many new algorithms to fight against spam including:
@@ -79,10 +83,12 @@ Description: Development headers for libdspam
 
 Package: libdspam7-drv-hash
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 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:
@@ -95,9 +101,11 @@ Description: Hash backend for DSPAM anti-spam filter
 
 Package: libdspam7-drv-pgsql
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, 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:
@@ -110,9 +118,11 @@ Description: PostgreSQL backend for DSPAM anti-spam filter
 
 Package: libdspam7-drv-mysql
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, libdspam7 (= ${binary:Version}), dbconfig-common, 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:
@@ -125,8 +135,10 @@ Description: MySQL backend for DSPAM anti-spam filter
 
 Package: libdspam7-drv-sqlite3
 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:
diff --git a/debian/dspam.install b/debian/dspam.install
index db6ff33..eeae0b8 100644
--- a/debian/dspam.install
+++ b/debian/dspam.install
@@ -12,6 +12,7 @@ usr/bin/dspamc
 usr/bin/dspam_dump
 usr/bin/dspam_logrotate
 usr/bin/dspam_merge
+usr/bin/dspam_pg2int8
 usr/bin/dspam_stats
 usr/bin/dspam_train
 usr/bin/dspam
diff --git a/debian/libdspam7-drv-hash.install b/debian/libdspam7-drv-hash.install
index 4138914..ec23bdd 100644
--- a/debian/libdspam7-drv-hash.install
+++ b/debian/libdspam7-drv-hash.install
@@ -1,2 +1,2 @@
-usr/lib/dspam/libhash_drv.so*
+usr/lib/*/dspam/libhash_drv.so*
 src/hash.conf                                   etc/dspam/dspam.d/
diff --git a/debian/libdspam7-drv-mysql.install b/debian/libdspam7-drv-mysql.install
index a75b173..f95baf1 100644
--- a/debian/libdspam7-drv-mysql.install
+++ b/debian/libdspam7-drv-mysql.install
@@ -1,6 +1,6 @@
 debian/sqlfiles/install/mysql                 usr/share/dbconfig-common/data/libdspam7-drv-mysql/install
 debian/sqlfiles/upgrade/mysql                 usr/share/dbconfig-common/data/libdspam7-drv-mysql/upgrade
-usr/lib/dspam/libmysql_drv.so*
+usr/lib/*/dspam/libmysql_drv.so*
 src/mysql.conf                                etc/dspam/dspam.d/
 src/tools.mysql_drv/mysql_objects-4.1.sql     usr/share/doc/libdspam7-drv-mysql/sql/
 src/tools.mysql_drv/purge-4.1.sql             usr/share/doc/libdspam7-drv-mysql/sql/
diff --git a/debian/libdspam7-drv-pgsql.install b/debian/libdspam7-drv-pgsql.install
index b067749..454be93 100644
--- a/debian/libdspam7-drv-pgsql.install
+++ b/debian/libdspam7-drv-pgsql.install
@@ -1,8 +1,7 @@
 debian/sqlfiles/install-dbadmin/pgsql      usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin
 debian/sqlfiles/install/pgsql              usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install
 debian/sqlfiles/upgrade/pgsql              usr/share/dbconfig-common/data/libdspam7-drv-pgsql/upgrade
-usr/bin/dspam_pg2int8
-usr/lib/dspam/libpgsql_drv.so*
+usr/lib/*/dspam/libpgsql_drv.so*
 src/pgsql.conf                             etc/dspam/dspam.d/
 src/tools.pgsql_drv/pgsql_objects.sql      usr/share/doc/libdspam7-drv-pgsql/sql/
 src/tools.pgsql_drv/purge-pe.sql           usr/share/doc/libdspam7-drv-pgsql/sql/
diff --git a/debian/libdspam7-drv-sqlite3.install b/debian/libdspam7-drv-sqlite3.install
index 695b28d..61bdd36 100644
--- a/debian/libdspam7-drv-sqlite3.install
+++ b/debian/libdspam7-drv-sqlite3.install
@@ -1,3 +1,3 @@
-usr/lib/dspam/libsqlite3_drv.so*
+usr/lib/*/dspam/libsqlite3_drv.so*
 src/sqlite.conf                              etc/dspam/dspam.d/
 src/tools.sqlite_drv/purge-3.sql             usr/share/doc/libdspam-drv-sqlite3/sql/
diff --git a/debian/libdspam7.install b/debian/libdspam7.install
index aa0514e..f3d3204 100644
--- a/debian/libdspam7.install
+++ b/debian/libdspam7.install
@@ -1 +1 @@
-usr/lib/libdspam.so.*
+usr/lib/*/libdspam.so.*

-- 
Debian packages for the DSPAM anti-spam filter

More information about the Pkg-dspam-commits mailing list