[SCM] gecko-mediaplayer/master: Use /usr/share/dpkg/buildflags.mk to export buildflags

[sramacher-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 71d60fbd5711829c052bf5712e8cf588586920f7
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Mon Jan 2 11:49:38 2012 +0100

    Use /usr/share/dpkg/buildflags.mk to export buildflags

diff --git a/debian/control b/debian/control
index dfbd356..2d2312a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,19 @@ Priority: optional
 Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
 Uploaders: Julien Lavergne <gilir at ubuntu.com>, Aron Xu <aron at debian.org>
 Build-Depends: debhelper (>= 8),
-	       autotools-dev,
-	       pkg-config (>= 0.20),
-	       libglib2.0-dev (>= 2.14),
-	       xulrunner-dev | firefox-dev,
-	       libdbus-1-dev (>= 0.95),
-	       libdbus-glib-1-dev (>= 0.70),
-               libgmtk-dev,
-               libgmlib-dev,
-	       libx11-dev,
-	       libidl0,
-	       libgconf2-dev (>= 2.20),
-               libcurl4-gnutls-dev | libcurl-dev
+ autotools-dev,
+ pkg-config (>= 0.20),
+ libglib2.0-dev (>= 2.14),
+ xulrunner-dev | firefox-dev,
+ libdbus-1-dev (>= 0.95),
+ libdbus-glib-1-dev (>= 0.70),
+ libgmtk-dev,
+ libgmlib-dev,
+ libx11-dev,
+ libidl0,
+ libgconf2-dev (>= 2.20),
+ libcurl4-gnutls-dev | libcurl-dev,
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/gecko-mediaplayer/
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gecko-mediaplayer.git
diff --git a/debian/rules b/debian/rules
index 0cff9e6..55600b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_CPPLAGS_MAINT_APPEND=-DMOZ_NO_ALLOC
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed
 
-CXXFLAGS = -Wall -g
-LDFLAGS  = -Wl,-z,defs -Wl,--as-needed
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O2
-endif
-
-CXXFLAGS += -DMOZ_NO_MOZALLOC
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 %:
 	dh $@

-- 
gecko-mediaplayer packaging