r11502 - packages/trunk/fenix/debian

Peter Pentchev roam-guest at alioth.debian.org
Thu Nov 25 23:18:53 UTC 2010


Author: roam-guest
Date: 2010-11-25 23:18:53 +0000 (Thu, 25 Nov 2010)
New Revision: 11502

Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/control
   packages/trunk/fenix/debian/rules
Log:
Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS and LDFLAGS.


Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2010-11-25 23:06:37 UTC (rev 11501)
+++ packages/trunk/fenix/debian/changelog	2010-11-25 23:18:53 UTC (rev 11502)
@@ -20,6 +20,7 @@
     - shorten the rules file using the dh(1) helper
     - use "dh --with autotools_dev" to handle config.guess and config.sub
     - use debhelper override rules
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 25 Nov 2010 13:25:18 +0200
 

Modified: packages/trunk/fenix/debian/control
===================================================================
--- packages/trunk/fenix/debian/control	2010-11-25 23:06:37 UTC (rev 11501)
+++ packages/trunk/fenix/debian/control	2010-11-25 23:18:53 UTC (rev 11502)
@@ -3,7 +3,8 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.50~), autotools-dev (>= 20100122.1~),
+Build-Depends: dpkg-dev (>= 1.15.7~), debhelper (>= 7.0.50~),
+ autotools-dev (>= 20100122.1~),
  libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, libgif-dev, libpng12-dev,
  libsmpeg-dev, libmikmod2-dev, libvorbis-dev
 Standards-Version: 3.9.1

Modified: packages/trunk/fenix/debian/rules
===================================================================
--- packages/trunk/fenix/debian/rules	2010-11-25 23:06:37 UTC (rev 11501)
+++ packages/trunk/fenix/debian/rules	2010-11-25 23:18:53 UTC (rev 11502)
@@ -3,19 +3,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-
-CFLAGS = -Wall -g -fno-strict-aliasing
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall -fno-strict-aliasing
 CFLAGS += -DUSE_GETTEXT
 
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS += -Wl,-z,defs
+
 override_dh_auto_configure:
 	chmod +x configure
 	dh_auto_configure -- \
@@ -25,7 +19,7 @@
 		--enable-fpg \
 		--enable-dependency-tracking \
 		CFLAGS="$(CFLAGS)" \
-		LDFLAGS="-Wl,-z,defs"
+		LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_build:
 	dh_auto_build -- CFLAGS="$(CFLAGS)"




More information about the Pkg-games-commits mailing list