[med-svn] [cnrun] 12/25: debian: updates to meet recent Debian developments

[andrei zavada]

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

hmmr-guest pushed a commit to branch WIP
in repository cnrun.

commit e2b8d3a3b6e01a8a8844c17bdc6a103fa3805581
Author: andrei zavada <johnhommer at gmail.com>
Date:   Sun Jun 22 00:15:28 2014 +0300

    debian: updates to meet recent Debian developments
    
    * drop build-deps on hardening-* in favour of dpkg-buildflags;
    * don't depend on a particular g++ version.
---
 debian/control |  2 +-
 debian/rules   | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 6c7ebb7..f9e7d19 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cnrun
 Section: science
 Priority: optional
 Maintainer: Andrei Zavada <johnhommer at gmail.com>
-Build-Depends: debhelper (>= 9), hardening-wrapper, hardening-includes, dh-autoreconf, autoconf-archive, g++ (>= 4:4.7~) | g++-4.7 | g++-4.8, libgomp1, libreadline6-dev, pkg-config, libgsl0-dev, libxml2-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, autoconf-archive, g++, libgomp1, libreadline6-dev, pkg-config, libgsl0-dev, libxml2-dev
 Standards-Version: 3.9.5
 Homepage: http://johnhommer.com/academic/code/cnrun
 Vcs-Git: git://git.debian.org/git/debian-med/cnrun.git
diff --git a/debian/rules b/debian/rules
index 4e10292..e69cdcc 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/cnrun.git