r11540 - packages/trunk/xmahjongg/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-30 16:01:56 +0000 (Tue, 30 Nov 2010)
New Revision: 11540

Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/control
   packages/trunk/xmahjongg/debian/rules
Log:
Use dpkg-buildflags to obtain CFLAGS, CPPFLAGS and LDFLAGS.


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2010-11-30 15:44:57 UTC (rev 11539)
+++ packages/trunk/xmahjongg/debian/changelog	2010-11-30 16:01:56 UTC (rev 11540)
@@ -10,6 +10,8 @@
     - break out the licenses' text into separate sections
     - change the short name of the GIF files' license (not quite GPL-2+)
     - bump the year on my copyright notice.
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain the default CFLAGS,
+    CPPFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 29 Nov 2010 17:18:09 +0200
 

Modified: packages/trunk/xmahjongg/debian/control
===================================================================
--- packages/trunk/xmahjongg/debian/control	2010-11-30 15:44:57 UTC (rev 11539)
+++ packages/trunk/xmahjongg/debian/control	2010-11-30 16:01:56 UTC (rev 11540)
@@ -4,7 +4,8 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7.0.50), libx11-dev, x11proto-core-dev, hardening-wrapper
+Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), libx11-dev,
+	x11proto-core-dev, hardening-wrapper
 Homepage: http://www.lcdf.org/xmahjongg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmahjongg
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmahjongg/?op=log

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2010-11-30 15:44:57 UTC (rev 11539)
+++ packages/trunk/xmahjongg/debian/rules	2010-11-30 16:01:56 UTC (rev 11540)
@@ -9,6 +9,10 @@
 PACKAGE=	xmahjongg
 D=		$(CURDIR)/debian/$(PACKAGE)
 
+CFLAGS=		$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS=	$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS=	$(shell dpkg-buildflags --get LDFLAGS)
+
 ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
 export DEB_BUILD_HARDENING=1
 else