[mupen64plus-video-z64] 92/161: Let debhelper set the buildflags implicitly

[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 4abbd5501b9c245d5fb480f3b462c47522decf5c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 18 16:53:15 2012 +0100

    Let debhelper set the buildflags implicitly
---
 debian/changelog | 7 +++++++
 debian/rules     | 6 +-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d3e591..79f2dad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-video-z64 (1.99.4+30+daa3f1b2fe76-2) UNRELEASED; urgency=low
+
+  [ Simon Ruderich ]
+  * Let debhelper set the buildflags implicitly
+
+ -- Sven Eckelmann <sven at narfation.org>  Sun, 18 Mar 2012 16:52:56 +0100
+
 mupen64plus-video-z64 (1.99.4+30+daa3f1b2fe76-1) unstable; urgency=low
 
   * New upstream snapshot from revision daa3f1b2fe768e35694e572f4ba74325e7480547
diff --git a/debian/rules b/debian/rules
index c14f621..d0d36bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,9 @@
 # -*- makefile -*-
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-LDFLAGS += -Wl,--as-needed
-
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" PIC=1 OPTFLAGS=""

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