[mupen64plus-ui-console] 77/172: Remove hardening-includes which are now integrated in dpkg-buildflags

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit 3b61683e6f363d91d4e22e2617d70d6d3be7d601
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Oct 16 01:19:21 2011 +0200

    Remove hardening-includes which are now integrated in dpkg-buildflags
---
 debian/changelog | 2 ++
 debian/control   | 1 -
 debian/rules     | 6 +-----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4e8b4c..8f0d40a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mupen64plus-ui-console (1.99.4-5) UNRELEASED; urgency=low
   * debian/patches:
     - Add cheat_leading_zeros.patch, Fix loading of cheats with leading zeros in
       CRC1/2
+  * Remove hardening-includes which are now integrated in dpkg-
+    buildflags
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 21 Aug 2011 17:55:08 +0200
 
diff --git a/debian/control b/debian/control
index f993cbf..07d2015 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-ui-con
 Build-Depends:
  debhelper (>= 8.0.0),
  dpkg-dev (>= 1.16.0),
- hardening-includes,
  libmupen64plus-dev,
 
 Package: mupen64plus-ui-console
diff --git a/debian/rules b/debian/rules
index eb181e5..23a4cb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie
 export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
@@ -8,11 +9,6 @@ export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-include /usr/share/hardening-includes/hardening.make
-CFLAGS += $(HARDENING_CFLAGS)
-CXXFLAGS += $(HARDENING_CFLAGS)
-LDFLAGS += $(HARDENING_LDFLAGS)
-
 LDFLAGS += -Wl,--as-needed
 
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git