[wxmupen64plus] 26/71: 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 experimental
in repository wxmupen64plus.

commit 25d0a4c11d5573d6af0e85212270966c651acfdd
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Oct 16 01:19:22 2011 +0200

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

diff --git a/debian/changelog b/debian/changelog
index f30b73e..8d098cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,7 @@ wxmupen64plus (0.1+82+5a1d61bc9e40-1) UNRELEASED; urgency=low
   * Initial release (Closes: #637771)
   * debian/patches:
     - Add single_window.patch, Enable single window mode on linux
+  * Remove hardening-includes which are now integrated in dpkg-
+    buildflags
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200
diff --git a/debian/control b/debian/control
index 1584824..cd037ac 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/wxmupen64plus.git
 Build-Depends:
  debhelper (>= 8.0.0),
  dpkg-dev (>= 1.16.0),
- hardening-includes,
  python,
  libmupen64plus-dev (>= 1.99.4+77+8bb0e6b3ae3a),
  libwxgtk2.9-dev,
diff --git a/debian/rules b/debian/rules
index 6132a84..c354209 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,8 @@ 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) -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
-CXXFLAGS += $(HARDENING_CFLAGS) -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
-LDFLAGS += $(HARDENING_LDFLAGS)
+CFLAGS += -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
+CXXFLAGS += -DCOREDIR="\"/usr/lib/$(DEB_HOST_MULTIARCH)/\""
 LDFLAGS += -ldl -lGL
 
 LDFLAGS += -Wl,--as-needed

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