[SCM] Packaging for teeworlds branch, master, updated. upstream/0.6.0-33-gd409651

Felix Geyer debfx-pkg at fobos.de
Fri Aug 5 09:48:39 UTC 2011


The following commit has been merged in the master branch:
commit d409651c6892b36d23ec013b20b1bc1eb045b2a7
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Aug 5 11:47:01 2011 +0200

    Query dpkg-buildflags instead of relying on dpkg-buildpackage to set the environment variables.

diff --git a/debian/changelog b/debian/changelog
index 806e71b..701a083 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ teeworlds (0.6.1+dfsg-1) UNRELEASED; urgency=low
   * Drop patches that have been applied upstream: fix-ftbfs-hurd.patch,
     fix-ftbfs-kfreebsd.patch and gcc-endianness.patch.
   * Use dh_link to create the DejaVuSans.ttf symlink.
+  * Query dpkg-buildflags instead of relying on dpkg-buildpackage to set the
+    environment variables.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 04 Aug 2011 11:30:35 +0200
 
diff --git a/debian/rules b/debian/rules
index 935d090..dcbd80b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-LDFLAGS += -Wl,--as-needed
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 upstreamversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
 

-- 
Packaging for teeworlds



More information about the Pkg-games-commits mailing list