r14425 - packages/trunk/gravitation/debian

[Paul Wise]

Author: pabs
Date: 2013-07-06 07:17:40 +0000 (Sat, 06 Jul 2013)
New Revision: 14425

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

Modified: packages/trunk/gravitation/debian/changelog
===================================================================
--- packages/trunk/gravitation/debian/changelog	2013-07-06 06:46:32 UTC (rev 14424)
+++ packages/trunk/gravitation/debian/changelog	2013-07-06 07:17:40 UTC (rev 14425)
@@ -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>  Sat, 06 Jul 2013 13:37:51 +0800
 

Modified: packages/trunk/gravitation/debian/rules
===================================================================
--- packages/trunk/gravitation/debian/rules	2013-07-06 06:46:32 UTC (rev 14424)
+++ packages/trunk/gravitation/debian/rules	2013-07-06 07:17:40 UTC (rev 14425)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
 	dh $@ --parallel
 
@@ -13,8 +15,9 @@
 	mkdir -p 32x32
 	convert -scale 32x32 gravitation.png 32x32/gravitation.png
 	convert 32x32/gravitation.png 32x32/gravitation.xpm
-	sed -i -e 's/PLATFORM_LINK_FLAGS = /PLATFORM_LINK_FLAGS = -lpthread /' game5/gameSource/Makefile
-	$(MAKE) -C game5/gameSource PLATFORM_COMPILE_FLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/gravitation\\\" -DDATADIR=\\\"/usr/share/games/gravitation/\\\""
+	sed -i -e 's/PLATFORM_COMPILE_FLAGS = */PLATFORM_COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' game5/gameSource/Makefile
+	sed -i -e 's/PLATFORM_LINK_FLAGS = */PLATFORM_LINK_FLAGS = $$(LDFLAGS) /' game5/gameSource/Makefile
+	$(MAKE) -C game5/gameSource LDFLAGS="-lpthread $(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/gravitation\\\" -DDATADIR=\\\"/usr/share/games/gravitation/\\\""
 
 override_dh_auto_clean:
 	find game5 -name "*.o" -delete