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

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit 66b337648d71032c0b8cec1f363947234177d3ef
Author: Thomas Preud'homme <thomas.preudhomme at celest.fr>
Date:   Thu Jun 16 15:40:36 2011 +0200

    Use dpkg-buildflags to set build flags in rules

diff --git a/debian/changelog b/debian/changelog
index 993fdf3..904139d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 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
 
- -- Julien Valroff <julien at debian.org>  Sun, 29 May 2011 14:07:56 +0200
+  [ Thomas Preud'homme ]
+  * Set build flags (CPPFLAGS, CFLAGS and LDFLAGS) using dpkg-buildflags.
+
+ -- Thomas Preud'homme <robotux at celest.fr>  Thu, 16 Jun 2011 15:56:05 +0200
 
 dspam (3.9.1~rc1+git20110514.347379b+dfsg-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 615ed7f..6c0c7c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,8 +34,13 @@ ifeq (,$(findstring disable_clamav,$(DEB_BUILD_OPTIONS)))
         CONFIGURE += --enable-clamav
 endif
 
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+
 # Without any effect for now due to http://bugs.debian.org/347650
-export LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+export LDFLAGS
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)

-- 
Debian packages for the DSPAM anti-spam filter