r12106 - packages/trunk/netrek-client-cow/debian

[Peter Pentchev]

Author: roam-guest
Date: 2011-04-11 11:52:34 +0000 (Mon, 11 Apr 2011)
New Revision: 12106

Modified:
   packages/trunk/netrek-client-cow/debian/changelog
   packages/trunk/netrek-client-cow/debian/control
   packages/trunk/netrek-client-cow/debian/rules
Log:
Use dpkg-buildflags for CPPFLAGS, CFLAGS, LDFLAGS default values.

Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================
--- packages/trunk/netrek-client-cow/debian/changelog	2011-04-11 11:52:00 UTC (rev 12105)
+++ packages/trunk/netrek-client-cow/debian/changelog	2011-04-11 11:52:34 UTC (rev 12106)
@@ -26,6 +26,8 @@
   * Use dh --with autotools_dev to handle config.guess and config.sub.
   * Bump the debhelper compatibility level to 8 with no changes.
   * Depend on libgmp-dev instead of libgmp3-dev.
+  * Use dpkg-buildflags to obtain the default values for CPPFLAGS,
+    CFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 08 Apr 2011 16:06:48 +0300
 

Modified: packages/trunk/netrek-client-cow/debian/control
===================================================================
--- packages/trunk/netrek-client-cow/debian/control	2011-04-11 11:52:00 UTC (rev 12105)
+++ packages/trunk/netrek-client-cow/debian/control	2011-04-11 11:52:34 UTC (rev 12106)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1), libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
+Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1), dpkg-dev (>= 1.15.7~), libsdl1.2-dev, libsdl-mixer1.2-dev, libgmp-dev, libxt-dev, libxxf86vm-dev, libimlib2-dev
 Standards-Version: 3.9.2
 Homepage: http://www.netrek.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/netrek-client-cow/

Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules	2011-04-11 11:52:00 UTC (rev 12105)
+++ packages/trunk/netrek-client-cow/debian/rules	2011-04-11 11:52:34 UTC (rev 12106)
@@ -4,8 +4,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-LDFLAGS=	-Wl,-z,defs
+CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
 
+LDFLAGS+=	-Wl,-z,defs
+
 export CPPFLAGS CFLAGS LDFLAGS
 
 override_dh_auto_configure: