r14043 - packages/trunk/between/debian

[Paul Wise]

Author: pabs
Date: 2013-05-09 07:32:20 +0000 (Thu, 09 May 2013)
New Revision: 14043

Modified:
   packages/trunk/between/debian/changelog
   packages/trunk/between/debian/compat
   packages/trunk/between/debian/control
   packages/trunk/between/debian/rules
Log:
Bump the debhelper compat to 9 and enable extra hardening

Modified: packages/trunk/between/debian/changelog
===================================================================
--- packages/trunk/between/debian/changelog	2013-05-08 12:40:47 UTC (rev 14042)
+++ packages/trunk/between/debian/changelog	2013-05-09 07:32:20 UTC (rev 14043)
@@ -1,3 +1,9 @@
+between (6+dfsg1-3) UNRELEASED; urgency=low
+
+  * Bump the debhelper compat to 9 and enable extra hardening
+
+ -- Paul Wise <pabs at debian.org>  Thu, 09 May 2013 14:35:30 +0800
+
 between (6+dfsg1-2) unstable; urgency=low
 
   * Document GPL code in the copyright file (Closes: #614052)

Modified: packages/trunk/between/debian/compat
===================================================================
--- packages/trunk/between/debian/compat	2013-05-08 12:40:47 UTC (rev 14042)
+++ packages/trunk/between/debian/compat	2013-05-09 07:32:20 UTC (rev 14043)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/between/debian/control
===================================================================
--- packages/trunk/between/debian/control	2013-05-08 12:40:47 UTC (rev 14042)
+++ packages/trunk/between/debian/control	2013-05-09 07:32:20 UTC (rev 14043)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Paul Wise <pabs at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
  imagemagick,
  libsdl1.2-dev,
  libgl1-mesa-dev | libgl-dev,

Modified: packages/trunk/between/debian/rules
===================================================================
--- packages/trunk/between/debian/rules	2013-05-08 12:40:47 UTC (rev 14042)
+++ packages/trunk/between/debian/rules	2013-05-09 07:32:20 UTC (rev 14043)
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 %:
-	dh --parallel $@
+	dh $@ --parallel
 
 override_dh_auto_configure:
 	chmod u+x game7/configure
@@ -16,8 +18,9 @@
 	sed -i -e 's/-lX11//' game7/gameSource/Makefile
 	sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game7/gameSource/Makefile
 	sed -i -e 's/^OPTIMIZE_FLAG = .*/OPTIMIZE_FLAG = /' game7/gameSource/Makefile
-	sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) /' game7/gameSource/Makefile
-	$(MAKE) -C game7/gameSource CFLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/between\\\" -DDATADIR=\\\"/usr/share/games/between/\\\""
+	sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' game7/gameSource/Makefile
+	sed -i -e 's/^LINK_FLAGS = /LINK_FLAGS = $$(LDFLAGS) /' game7/gameSource/Makefile
+	$(MAKE) -C game7/gameSource LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/between\\\" -DDATADIR=\\\"/usr/share/games/between/\\\""
 
 override_dh_auto_clean:
 	[ ! -f game7/gameSource/Makefile ] || $(MAKE) -C game7/gameSource clean