[SCM] matanza - a space ascii war game branch, master, updated. debian/0.13+ds1-1-18-g4a4c55f

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 0f03806f02951568c3f566ebbe8ca9fa107f88c0
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sun Dec 5 23:00:37 2010 +0200

    Use dpkg-buildflags to obtain CPPFLAGS, CFLAGS and LDFLAGS.

diff --git a/debian/changelog b/debian/changelog
index f639d6e..fe44a4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 matanza (0.13+ds1-2) UNRELEASED; urgency=low
 
-  TODO: dpkg-buildflags
   TODO: debhelper 8
 
   * New maintainer.  Closes: #442045
@@ -12,6 +11,8 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.1 with no changes.
   * Convert the copyright file to the DEP 5 format and add my notice.
   * Add the Vcs-Git and Vcs-Browser source control fields.
+  * Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS
+    and LDFLAGS.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 24 Oct 2010 18:56:37 +0300
 
diff --git a/debian/control b/debian/control
index 52184af..89fd4c6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
-Build-Depends: debhelper (>= 5), autotools-dev, texlive-extra-utils, libpng12-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.15.7~),
+	autotools-dev, texlive-extra-utils, libpng12-dev
 Standards-Version: 3.9.1
 Homepage: http://bachue.com/matanza/
 Vcs-Git: git://git.debian.org/git/pkg-games/matanza.git
diff --git a/debian/rules b/debian/rules
index e9821cb..ad597f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -Wall
+export CFLAGS CPPFLAGS LDFLAGS
 
 build: build-stamp
 build-stamp:

-- 
matanza - a space ascii war game