r14449 - packages/trunk/primrose/debian

[Paul Wise]

Author: pabs
Date: 2013-07-07 06:21:11 +0000 (Sun, 07 Jul 2013)
New Revision: 14449

Modified:
   packages/trunk/primrose/debian/changelog
   packages/trunk/primrose/debian/rules
Log:
Fix dpkg-buildflags use, add more hardening

Modified: packages/trunk/primrose/debian/changelog
===================================================================
--- packages/trunk/primrose/debian/changelog	2013-07-07 06:02:03 UTC (rev 14448)
+++ packages/trunk/primrose/debian/changelog	2013-07-07 06:21:11 UTC (rev 14449)
@@ -3,6 +3,7 @@
   * Wrap and sort various files
   * Switch to debhelper compat 9
   * Fix and use canonical Vcs-* URLs
+  * Fix dpkg-buildflags use, add more hardening
 
  -- Paul Wise <pabs at debian.org>  Sun, 07 Jul 2013 13:49:41 +0800
 

Modified: packages/trunk/primrose/debian/rules
===================================================================
--- packages/trunk/primrose/debian/rules	2013-07-07 06:02:03 UTC (rev 14448)
+++ packages/trunk/primrose/debian/rules	2013-07-07 06:21:11 UTC (rev 14449)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@ --parallel
 
@@ -14,7 +16,7 @@
 	convert -background None -gravity center -extent 64x64 tilePlacementGames/game1/gameSource/iPhone/icon.png 64x64/primrose.png
 	cp -f tilePlacementGames/game1/build/win32/icon.png 32x32/primrose.png
 	convert 32x32/primrose.png 32x32/primrose.xpm
-	$(MAKE) -C tilePlacementGames/game1/gameSource PLATFORM_LINK_FLAGS="-lGL -lSDL -lpthread" PLATFORM_COMPILE_FLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/primrose\\\" -DDATADIR=\\\"/usr/share/games/primrose/\\\""
+	$(MAKE) -C tilePlacementGames/game1/gameSource PLATFORM_LINK_FLAGS="-lGL -lSDL -lpthread $(LDFLAGS)" PLATFORM_COMPILE_FLAGS="$(CFLAGS) $(CPPFLAGS) -DETCDIR=\\\"/etc/primrose\\\" -DDATADIR=\\\"/usr/share/games/primrose/\\\""
 
 override_dh_auto_clean:
 	[ ! -f tilePlacementGames/game1/gameSource/Makefile ] || $(MAKE) -C tilePlacementGames/game1/gameSource clean