[uqm] 09/12: enable hardened and verbose build

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository uqm.

commit 1f77902e42c2cede3ad48e49b1b983583a0aeedd
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Apr 7 16:53:17 2016 +0200

    enable hardened and verbose build
---
 debian/changelog          | 1 +
 debian/rules              | 6 ++++++
 sc2/build.vars.in         | 2 +-
 sc2/src/sc2code/gameopt.c | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe5ccb4..f84faf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ uqm (0.6.2.dfsg-9.2) UNRELEASED; urgency=medium
   * Fix typo in short description.  (Closes: #751601)
   * Move icon to /usr/share/pixmaps.  (Closes: #680262)
   * Use canonical https URLs for Vcs-*.
+  * Enable hardened and verbose build.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 07 Apr 2016 15:41:32 +0200
 
diff --git a/debian/rules b/debian/rules
index 07041c0..214f3f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+export MAKE_VERBOSE = 1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
diff --git a/sc2/build.vars.in b/sc2/build.vars.in
index c092ac6..23ecdca 100644
--- a/sc2/build.vars.in
+++ b/sc2/build.vars.in
@@ -29,7 +29,7 @@ ECHON='@ECHON@'
 SED='@SED@'
 REZ='@REZ@'
 WINDRES='@WINDRES@'
-uqm_CFLAGS='@CFLAGS@ -g'
+uqm_CFLAGS='@CFLAGS@ -g'" $CPPFLAGS"
 uqm_LDFLAGS='@LDFLAGS@ -lm'
 uqm_INSTALL_BINDIR=$DESTDIR'@INSTALL_BINDIR@'
 uqm_INSTALL_LIBDIR=$DESTDIR'@INSTALL_LIBDIR@'
diff --git a/sc2/src/sc2code/gameopt.c b/sc2/src/sc2code/gameopt.c
index afd89d8..42936c9 100644
--- a/sc2/src/sc2code/gameopt.c
+++ b/sc2/src/sc2code/gameopt.c
@@ -1149,7 +1149,7 @@ ChangeGameSelection:
 
 				t.baseline.x = r.corner.x + 3;
 				if (((SUMMARY_DESC *)pMS->Extra)[NewState - SHIFT + i].year_index == 0)
-					sprintf (buf, GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
+					sprintf (buf, "%s", GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
 				else
 				{
 					DateToString (buf2, sizeof buf2,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/uqm.git