[med-svn] [aghermann] 01/01: debian: deal w/ lintian issue re deprec'd hardening-*; maint ver bump to -2

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 881afacfed93f5c7d85e4995ab594215f52288c8
Author: Andrei Zavada <hmmr at ra>
Date:   Sat Jun 21 17:20:05 2014 +0300

    debian: deal w/ lintian issue re deprec'd hardening-*; maint ver bump to -2
    
    so use dpkg-buildflags instead of deprecated hardening-{includes,wrapper}
---
 debian/changelog |  6 ++++++
 debian/control   |  2 +-
 debian/rules     | 10 ++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45fef0e..65ddea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aghermann (1.0.1-2) unstable; urgency=low
+
+  * Use dpkg-buildflags instead of deprecated hardening-{includes,wrapper}.
+
+ -- Andrei Zavada <johnhommer at gmail.com>  Sat, 21 Jun 2014 16:22:33 +0200
+
 aghermann (1.0.1-1) unstable; urgency=low
 
   * Undo all g++ version checks, now that testing has 4.8 as default
diff --git a/debian/control b/debian/control
index 2c8d6b8..2c85573 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: aghermann
 Section: science
 Priority: optional
 Maintainer: Andrei Zavada <johnhommer at gmail.com>
-Build-Depends: debhelper (>= 9), dh-autoreconf, hardening-wrapper, hardening-includes,
+Build-Depends: debhelper (>= 9), dh-autoreconf,
  autoconf-archive, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev,
  libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev,
  liblua5.2-dev, lua5.2, libxml2-utils
diff --git a/debian/rules b/debian/rules
index 8ae0382..4848fe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DEB_BUILD_HARDENING=1
-
-include /usr/share/hardening-includes/hardening.make
-
-CXXFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CXXFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 %:
 	dh $@ --with autoreconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git