r14441 - packages/trunk/passage/debian

[Paul Wise]

Author: pabs
Date: 2013-07-07 05:08:20 +0000 (Sun, 07 Jul 2013)
New Revision: 14441

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

Modified: packages/trunk/passage/debian/changelog
===================================================================
--- packages/trunk/passage/debian/changelog	2013-07-07 05:02:21 UTC (rev 14440)
+++ packages/trunk/passage/debian/changelog	2013-07-07 05:08:20 UTC (rev 14441)
@@ -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 12:52:32 +0800
 

Modified: packages/trunk/passage/debian/rules
===================================================================
--- packages/trunk/passage/debian/rules	2013-07-07 05:02:21 UTC (rev 14440)
+++ packages/trunk/passage/debian/rules	2013-07-07 05:08:20 UTC (rev 14441)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@ --parallel
 
@@ -15,7 +17,9 @@
 	composite -compose CopyOpacity mask.png gamma256/build/macOSX/iconColor.png passage.png
 	convert -scale 32x32 passage.png 32x32/passage.png 
 	convert 32x32/passage.png 32x32/passage.xpm
-	$(MAKE) -C gamma256/gameSource PLATFORM_COMPILE_FLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/passage\\\" -DDATADIR=\\\"/usr/share/games/passage/\\\""
+	sed -i -e 's/PLATFORM_COMPILE_FLAGS = */PLATFORM_COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' gamma256/gameSource/Makefile
+	sed -i -e 's/PLATFORM_LINK_FLAGS = */PLATFORM_LINK_FLAGS = $$(LDFLAGS) /' gamma256/gameSource/Makefile
+	$(MAKE) -C gamma256/gameSource LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/passage\\\" -DDATADIR=\\\"/usr/share/games/passage/\\\""
 
 override_dh_auto_clean:
 	find gamma256 -name "*.o" -delete