This is an automated email from the git hooks/post-receive script. roam-guest pushed a commit to branch master in repository fenix.
commit c1e57480520e45742b54979f1e94f5f94c8dd4f0 Author: Peter Pentchev <[email protected]> Date: Thu Nov 25 23:18:53 2010 +0000 Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CFLAGS and LDFLAGS. --- debian/changelog | 1 + debian/control | 3 ++- debian/rules | 18 ++++++------------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0bb023a..92629b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low - 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 <[email protected]> Thu, 25 Nov 2010 13:25:18 +0200 diff --git a/debian/control b/debian/control index 397f999..af98ca1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: devel Priority: extra Maintainer: Debian Games Team <[email protected]> Uploaders: Miriam Ruiz <[email protected]>, Barry deFreese <[email protected]> -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 diff --git a/debian/rules b/debian/rules index eb186be..8cec7fa 100755 --- a/debian/rules +++ b/debian/rules @@ -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 @@ override_dh_auto_configure: --enable-fpg \ --enable-dependency-tracking \ CFLAGS="$(CFLAGS)" \ - LDFLAGS="-Wl,-z,defs" + LDFLAGS="$(LDFLAGS)" override_dh_auto_build: dh_auto_build -- CFLAGS="$(CFLAGS)" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
