[darkplaces] 02/03: debian/rules: re-order so that DEB_CPPFLAGS_MAINT_APPEND take effect

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository darkplaces.

commit ceb6bc550af0328c50780fef9003adc35c5de379
Author: Simon McVittie <smcv at debian.org>
Date:   Tue May 5 11:13:48 2015 +0100

    debian/rules: re-order so that DEB_CPPFLAGS_MAINT_APPEND take effect
---
 debian/changelog |  1 +
 debian/rules     | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8eecfbe..0cbc557 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 darkplaces (0~20140513+svn12208-2) UNRELEASED; urgency=medium
 
   * debian/gbp.conf: stop forcing gzip compression
+  * debian/rules: re-order so that DEB_CPPFLAGS_MAINT_APPEND take effect
 
  -- Simon McVittie <smcv at debian.org>  Tue, 05 May 2015 11:10:22 +0100
 
diff --git a/debian/rules b/debian/rules
index c4862a3..8beb4d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpkg/default.mk
-
-%:
-	dh $@
-
-distro := $(shell lsb_release -is)
-debian_version := $(shell dpkg-parsechangelog -c1 | sed -ne 's/^Version: //p')
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/vendor.mk
 
-DEB_CFLAGS_MAINT_APPEND := \
+DEB_CFLAGS_MAINT_APPEND = \
 	-Wall \
 	-Wextra \
 	-Wstrict-prototypes \
@@ -22,18 +17,23 @@ DEB_CFLAGS_MAINT_APPEND := \
 	-fno-strict-aliasing \
 	$(NULL)
 
-DEB_CPPFLAGS_MAINT_APPEND := \
-	-DSVNREVISION=$(debian_version) \
-	-DBUILDTYPE=$(distro) \
+DEB_CPPFLAGS_MAINT_APPEND = \
+	-DSVNREVISION=$(DEB_VERSION) \
+	-DBUILDTYPE=$(DEB_VENDOR) \
 	-DNO_BUILD_TIMESTAMPS \
 	$(NULL)
 
+include /usr/share/dpkg/default.mk
+
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 TARGETS = sdl2-release sv-release
 else
 TARGETS = sdl2-debug sv-debug
 endif
 
+%:
+	dh $@
+
 # LDFLAGS_* are used to compile builddate.c, so yes, they do need to include
 # the CPPFLAGS.
 override_dh_auto_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/darkplaces.git