[SCM] rosegarden/master: Enable hardening of build

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0b42a230bd9ac9c56a1d50a6af524bb297358c25
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Mar 3 23:25:06 2014 +1100

    Enable hardening of build
    
    * switch to debhelper compat level 9
    * use autoreconf to ensure that an up-to-date autotools is used
    * fiddle with build flags to actually get flags to the compiler

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a444289..96278fd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders:
  Free Ekanayaka <freee at debian.org>,
  Stuart Prescott <stuart+debian at nanonanonano.net>
 Build-Depends:
- automake,
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
+ dh-autoreconf,
  dssi-dev (>= 0.4),
  fftw3-dev,
  ladspa-sdk,
diff --git a/debian/rules b/debian/rules
index cd939ca..57e4252 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,12 @@ DEB_BUILD_ARCH := $(shell dpkg --print-architecture)
 ARCH=$(DEB_BUILD_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# Enable hardening
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/buildflags.mk
+CFLAGS+=$(CPPFLAGS)
+CXXFLAGS+=$(CPPFLAGS)
+
 ifeq ($(ARCH),alpha)
 CXXFLAGS+=-O0 -mieee
 else
@@ -22,13 +28,12 @@ endif
 ###
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with autoreconf
 
 override_dh_clean:
 	dh_clean -Xautom4te.cache
 
 override_dh_auto_configure:
-	sh ./bootstrap.sh
 	dh_auto_configure -- \
 		--enable-debug \
 		--with-qtlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)

-- 
rosegarden packaging