enable hardening build flags

diff --git a/debian/changelog b/debian/changelog
index 246f5aec811d56ec31957b8780223c7cda3fc918..8ab5de5a4b7c44e8f787f8889532b9ba5a7b1805 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 amanda (1:3.3.1-1) UNRELEASED; urgency=low
 
-  * new upstream version
+  * new upstream version, closes: #655025, #658933
+  * enable hardening build flags, closes: #644437
+  * include Indonesian translation, closes: #658482
 
  -- Bdale Garbee <bdale@gag.com>  Mon, 19 Mar 2012 15:43:05 +0100
 

diff --git a/debian/rules b/debian/rules
index 8995e7039c25c0ef6a78cb013a3564df0b312ce5..cfe01c5e5eaa972024d74fa929f243ef150bea10 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 
 export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
 r=$(shell pwd)/debian/amanda-common
 s=$(shell pwd)/debian/amanda-server
 c=$(shell pwd)/debian/amanda-client
@@ -51,7 +54,7 @@ build-arch: build-stamp
 build-indep: build-stamp
 build-stamp: configure-stamp
        dh_testdir
-       MAILER=/usr/bin/mail $(MAKE) CFLAGS="-O2 -g -Wall \
+       MAILER=/usr/bin/mail $(MAKE) CFLAGS="$(CFLAGS) -O2 -g -Wall \
                -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
                -DIGNORE_TAR_ERRORS "
        touch build-stamp