[mupen64plus-video-z64] 72/161: 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 master
in repository mupen64plus-video-z64.

commit af2d1f3e246351a98a981101effbc1b84eef5bc8
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, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6cbe1f0..01982da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mupen64plus-video-z64 (1.99.4-4) UNRELEASED; urgency=low
   * debian/control:
     - Add virtual package libsdl-dev as alternative build dependency
   * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+  * Remove hardening-includes which are now integrated in dpkg-
+    buildflags
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Aug 2011 21:54:58 +0200
 
diff --git a/debian/control b/debian/control
index c127ca1..4cd58bb 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-video-
 Build-Depends:
  debhelper (>= 8.1.3),
  dpkg-dev (>= 1.16.0),
- hardening-includes,
  libgl1-mesa-dev | libgl-dev,
  libglew1.6-dev | libglew-dev,
  libmupen64plus-dev,
diff --git a/debian/rules b/debian/rules
index cd966bf..cfc9a3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,12 +8,6 @@ export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-DEB_BUILD_HARDENING_PIE:=0
-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-video-z64.git