[iortcw] 05/06: debian/rules: align with ioquake3's (cosmetic changes only)

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository iortcw.

commit f8b159f87bee820b81643377e954e0e531f458fb
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Sep 21 11:20:25 2016 +0100

    debian/rules: align with ioquake3's (cosmetic changes only)
---
 debian/changelog | 1 +
 debian/rules     | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dddeba8..e1e82ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ iortcw (1.42d+dfsg1-4) UNRELEASED; urgency=medium
   * Bump debhelper compat level to 10
     - don't explicitly use dh-systemd, it is now integrated
     - don't explicitly do a parallel build, it is the default
+  * debian/rules: align with ioquake3's (cosmetic changes only)
 
  -- Simon McVittie <smcv at debian.org>  Sun, 17 Jul 2016 20:50:57 +0100
 
diff --git a/debian/rules b/debian/rules
index 1904340..1416757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-DEB_MAINT_CFLAGS_APPEND := -fsigned-char
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+DEB_CFLAGS_MAINT_APPEND := \
+	-fsigned-char \
+	$(NULL)
+
 include /usr/share/dpkg/default.mk
 
 %:
@@ -26,8 +29,8 @@ options := \
 	USE_OPENAL=1 \
 	USE_OPENAL_DLOPEN=0 \
 	USE_VOIP=1 \
-	BUILD_GAME_QVM=0 \
 	$(shell debian/q3arch make ${DEB_HOST_GNU_CPU} ${DEB_HOST_GNU_SYSTEM}) \
+	BUILD_GAME_QVM=0 \
 	COPYDIR=/usr/lib/rtcw \
 	VERSION=$(DEB_VERSION)/$(DEB_VENDOR) \
 	CFLAGS='$(filter-out -fPIE -pie,$(CFLAGS)) $(CPPFLAGS)' \
@@ -35,10 +38,12 @@ options := \
 	LDFLAGS='$(filter-out -fPIE -pie,$(LDFLAGS))' \
 	NOTSHLIBLDFLAGS='$(filter -fPIE -pie,$(LDFLAGS))' \
 	$(NULL)
+
 sp_options := \
 	BR=$(CURDIR)/debian/build/sp \
 	BD=$(CURDIR)/debian/build/sp \
 	$(NULL)
+
 mp_options := \
 	BR=$(CURDIR)/debian/build/mp \
 	BD=$(CURDIR)/debian/build/mp \

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