r11774 - packages/trunk/tecnoballz/debian

[Peter Pentchev]

Author: roam-guest
Date: 2011-02-17 15:24:12 +0000 (Thu, 17 Feb 2011)
New Revision: 11774

Modified:
   packages/trunk/tecnoballz/debian/changelog
   packages/trunk/tecnoballz/debian/control
   packages/trunk/tecnoballz/debian/rules
Log:
Use dpkg-buildflags to obtain the default CPPFLAGS, CXXFLAGS and LDFLAGS.


Modified: packages/trunk/tecnoballz/debian/changelog
===================================================================
--- packages/trunk/tecnoballz/debian/changelog	2011-02-17 13:15:43 UTC (rev 11773)
+++ packages/trunk/tecnoballz/debian/changelog	2011-02-17 15:24:12 UTC (rev 11774)
@@ -9,6 +9,8 @@
     - break the clean-up list and the manpages list into debian/* files
     - minimize the rules file by using debhelper override rules
   * Add the 031_honor_cxxflags patch.
+  * Use dpkg-buildflags to obtain the default values for CPPFLAGS,
+    CXXFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 17 Feb 2011 10:35:58 +0200
 

Modified: packages/trunk/tecnoballz/debian/control
===================================================================
--- packages/trunk/tecnoballz/debian/control	2011-02-17 13:15:43 UTC (rev 11773)
+++ packages/trunk/tecnoballz/debian/control	2011-02-17 15:24:12 UTC (rev 11774)
@@ -3,7 +3,8 @@
 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), autoconf, automake, libsdl-mixer1.2-dev, 
+Build-Depends: debhelper (>= 8), autoconf, automake, dpkg-dev (>= 1.15.7~),
+               libsdl-mixer1.2-dev, 
                libmikmod2-dev, libxext-dev, libvorbis-dev, 
                libogg-dev, libsmpeg-dev, libxxf86dga-dev, 
                libxxf86vm-dev, autotools-dev,

Modified: packages/trunk/tecnoballz/debian/rules
===================================================================
--- packages/trunk/tecnoballz/debian/rules	2011-02-17 13:15:43 UTC (rev 11773)
+++ packages/trunk/tecnoballz/debian/rules	2011-02-17 15:24:12 UTC (rev 11774)
@@ -3,17 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Optimisation flag if needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS += -O0
-else
-	CXXFLAGS += -O2
-endif
+CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
 # Warnings
-CXXFLAGS = -g -Wall
+CXXFLAGS += -Wall -fno-strict-aliasing
 
-export CXXFLAGS
+export CPPFLAGS CXXFLAGS LDFLAGS
 
 override_dh_auto_configure:
 	autoreconf -fvi