[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.8-2-8-g6b45a40

[Simon McVittie]

The following commit has been merged in the master branch:
commit 6b45a40a950e24e7f2e7021aee91a5e8b2ba2b1a
Author: Simon McVittie <smcv at debian.org>
Date:   Sun May 20 18:39:34 2012 +0100

    Include CPPFLAGS in CFLAGS for full hardening (the build system doesn't respect CPPFLAGS otherwise)

diff --git a/debian/changelog b/debian/changelog
index 13b918a..dcf61e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openarena (0.8.8-4) unstable; urgency=high
   [ Simon McVittie ]
   * When we upgraded from before 0.8.8, actually avoid running the server
     as intended (thanks to Stepan Golosunov for the patch; closes: #673128)
+  * Include CPPFLAGS in CFLAGS for full hardening (the build system doesn't
+    respect CPPFLAGS otherwise)
 
  -- Simon McVittie <smcv at debian.org>  Mon, 16 Apr 2012 12:18:38 +0100
 
diff --git a/debian/rules b/debian/rules
index 1b8f939..828976c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@ Q3COMPILE_ARCH     := $(shell /usr/share/ioquake3/q3arch arch     BUILD)
 Q3COMPILE_PLATFORM := $(shell /usr/share/ioquake3/q3arch platform BUILD)
 distro             := $(shell lsb_release -is)
 
-CFLAGS += -fsigned-char
+# the Q3 engine's build system doesn't respect CPPFLAGS, so put them in CFLAGS
+CFLAGS += $(CPPFLAGS) -fsigned-char
 
 GAME_OPTIONS = \
 	V=1 \

-- 
Packaging for the OpenArena engine