[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:54 UTC 2011 

The following commit has been merged in the master branch:
commit 703bbd3dfb24f12474d6c2df0d94878bdcc28f5e
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jul 30 09:36:50 2011 +0200

    Allows easy backport

diff --git a/debian/control b/debian/control
index bc8f611..54c4e3a 100644
--- a/debian/control
+++ b/debian/control
@@ -208,7 +208,8 @@ Description: debugging symbols for libdspam7-drv-hash
   * Advanced de-obfuscation techniques
   * Bayesian Noise Reduction
  .
- This package includes the debugging symbols for the libdspam7-drv-hash package.
+ This package includes the debugging symbols for the libdspam7-drv-hash
+ package.
 
 Package: libdspam7-drv-mysql-dbg
 Section: debug
@@ -224,7 +225,8 @@ Description: debugging symbols for libdspam7-drv-mysql
   * Advanced de-obfuscation techniques
   * Bayesian Noise Reduction
  .
- This package includes the debugging symbols for the libdspam7-drv-mysql package.
+ This package includes the debugging symbols for the libdspam7-drv-mysql
+ package.
 
 Package: libdspam7-drv-pgsql-dbg
 Section: debug
@@ -240,7 +242,8 @@ Description: debugging symbols for libdspam7-drv-pgsql
   * Advanced de-obfuscation techniques
   * Bayesian Noise Reduction
  .
- This package includes the debugging symbols for the libdspam7-drv-pgsql package.
+ This package includes the debugging symbols for the libdspam7-drv-pgsql
+ package.
 
 Package: libdspam7-drv-sqlite3-dbg
 Section: debug
@@ -256,4 +259,5 @@ Description: debugging symbols for libdspam7-drv-sqlite3
   * Advanced de-obfuscation techniques
   * Bayesian Noise Reduction
  .
- This package includes the debugging symbols for the libdspam7-drv-sqlite3 package.
+ This package includes the debugging symbols for the libdspam7-drv-sqlite3
+ package.
diff --git a/debian/libdspam7-dev.install b/debian/libdspam7-dev.install.in
similarity index 50%
rename from debian/libdspam7-dev.install
rename to debian/libdspam7-dev.install.in
index 7ae5c85..f977feb 100644
--- a/debian/libdspam7-dev.install
+++ b/debian/libdspam7-dev.install.in
@@ -1,6 +1,6 @@
 usr/include/dspam/*
-usr/lib/*/libdspam.a
-usr/lib/*/libdspam.so
-usr/lib/*/pkgconfig/dspam.pc
+usr/lib/@DEB_HOST_MULTIARCH@/libdspam.a
+usr/lib/@DEB_HOST_MULTIARCH@/libdspam.so
+usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/dspam.pc
 src/auto-config.h                      usr/include/dspam
 src/pref.h                             usr/include/dspam
diff --git a/debian/libdspam7-drv-hash.install b/debian/libdspam7-drv-hash.install.in
similarity index 56%
rename from debian/libdspam7-drv-hash.install
rename to debian/libdspam7-drv-hash.install.in
index ec23bdd..d691de6 100644
--- a/debian/libdspam7-drv-hash.install
+++ b/debian/libdspam7-drv-hash.install.in
@@ -1,2 +1,2 @@
-usr/lib/*/dspam/libhash_drv.so*
+usr/lib/@DEB_HOST_MULTIARCH@/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.in
similarity index 92%
rename from debian/libdspam7-drv-mysql.install
rename to debian/libdspam7-drv-mysql.install.in
index f95baf1..bcc65d6 100644
--- a/debian/libdspam7-drv-mysql.install
+++ b/debian/libdspam7-drv-mysql.install.in
@@ -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/@DEB_HOST_MULTIARCH@/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.in
similarity index 92%
rename from debian/libdspam7-drv-pgsql.install
rename to debian/libdspam7-drv-pgsql.install.in
index 454be93..f4e4149 100644
--- a/debian/libdspam7-drv-pgsql.install
+++ b/debian/libdspam7-drv-pgsql.install.in
@@ -1,7 +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/lib/*/dspam/libpgsql_drv.so*
+usr/lib/@DEB_HOST_MULTIARCH@/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.in
similarity index 73%
rename from debian/libdspam7-drv-sqlite3.install
rename to debian/libdspam7-drv-sqlite3.install.in
index 61bdd36..06859aa 100644
--- a/debian/libdspam7-drv-sqlite3.install
+++ b/debian/libdspam7-drv-sqlite3.install.in
@@ -1,3 +1,3 @@
-usr/lib/*/dspam/libsqlite3_drv.so*
+usr/lib/@DEB_HOST_MULTIARCH@/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
deleted file mode 100644
index f3d3204..0000000
--- a/debian/libdspam7.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdspam.so.*
diff --git a/debian/libdspam7.install.in b/debian/libdspam7.install.in
new file mode 100644
index 0000000..967b8a7
--- /dev/null
+++ b/debian/libdspam7.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libdspam.so.*
diff --git a/debian/rules b/debian/rules
index f6079a2..a21bd7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Allows easy backporting on non-multiarch aware distributions
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+  
+PREPROCESS_FILES := $(wildcard debian/*.install.in)
+
+$(PREPROCESS_FILES:.in=): %: %.in
+	sed 's, at DEB_HOST_MULTIARCH@/,$(DEB_HOST_MULTIARCH:=/),g' $< > $@
+
+ifneq (,$(DEB_HOST_MULTIARCH))
+override_dh_gencontrol:
+	dh_gencontrol -- -Vmisc:Multi-Arch=same
+endif
+
 # The first driver stated hear will be used as the 
 # default driver in dspam.conf
 STORAGE = "hash_drv,mysql_drv,pgsql_drv,sqlite3_drv"
@@ -50,7 +63,7 @@ DEB_BUILD_GNU_TYPE  := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 %:
 	dh $@ --with autoreconf
 
-override_dh_auto_configure:
+override_dh_auto_configure: $(PREPROCESS_FILES:.in=)
 	dh_auto_configure -- --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) $(CONFIGURE)
 
 	# dh_install does not support renaming
@@ -66,6 +79,7 @@ override_dh_auto_configure:
 	cp src/dspam.conf.in src/dspam.conf.in.orig
 	./debian/split-config.sh
 
+
 override_dh_makeshlibs:
 	dh_makeshlibs -Nlibdspam7-drv-hash -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-sqlite3
 
@@ -95,3 +109,11 @@ override_dh_auto_clean:
 	-rm -f src/mysql.conf
 	-rm -f src/pgsql.conf
 	-mv src/dspam.conf.in.orig src/dspam.conf.in
+
+	# Remove install files generated from install.in files
+	-rm -f debian/libdspam7.install
+	-rm -f debian/libdspam7-dev.install
+	-rm -f debian/libdspam7-drv-hash.install
+	-rm -f debian/libdspam-drv-mysql.install
+	-rm -f debian/libdspam7-drv-pgsql.install
+	-rm -f debian/libdspam7-drv-sqlite3.install

-- 
Debian packages for the DSPAM anti-spam filter

More information about the Pkg-dspam-commits mailing list