r14201 - packages/trunk/cultivation/debian

[Paul Wise]

Author: pabs
Date: 2013-06-02 04:58:06 +0000 (Sun, 02 Jun 2013)
New Revision: 14201

Modified:
   packages/trunk/cultivation/debian/changelog
   packages/trunk/cultivation/debian/compat
   packages/trunk/cultivation/debian/control
   packages/trunk/cultivation/debian/rules
Log:
Upgrade to debhelper compat 9, add hardening

Modified: packages/trunk/cultivation/debian/changelog
===================================================================
--- packages/trunk/cultivation/debian/changelog	2013-06-02 04:16:22 UTC (rev 14200)
+++ packages/trunk/cultivation/debian/changelog	2013-06-02 04:58:06 UTC (rev 14201)
@@ -9,6 +9,7 @@
 
   [ Paul Wise ]
   * Use the canonical and working URLs for Vcs-*
+  * Upgrade to debhelper compat 9, add hardening
 
  -- Barry deFreese <bdefreese at debian.org>  Sat, 01 Jun 2013 16:54:56 -0400
 

Modified: packages/trunk/cultivation/debian/compat
===================================================================
--- packages/trunk/cultivation/debian/compat	2013-06-02 04:16:22 UTC (rev 14200)
+++ packages/trunk/cultivation/debian/compat	2013-06-02 04:58:06 UTC (rev 14201)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/cultivation/debian/control
===================================================================
--- packages/trunk/cultivation/debian/control	2013-06-02 04:16:22 UTC (rev 14200)
+++ packages/trunk/cultivation/debian/control	2013-06-02 04:58:06 UTC (rev 14201)
@@ -7,7 +7,7 @@
  Peter De Wachter <pdewacht at gmail.com>,
  Paul Wise <pabs at debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
  dpkg-dev (>= 1.16.1~),
  freeglut3-dev,
  imagemagick,

Modified: packages/trunk/cultivation/debian/rules
===================================================================
--- packages/trunk/cultivation/debian/rules	2013-06-02 04:16:22 UTC (rev 14200)
+++ packages/trunk/cultivation/debian/rules	2013-06-02 04:58:06 UTC (rev 14201)
@@ -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 game2/configure
@@ -16,8 +18,9 @@
 	sed -i -e 's/-lX11//' game2/gameSource/Makefile
 	sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game2/gameSource/Makefile
 	sed -i -e 's/^OPTIMIZE_FLAG = .*/OPTIMIZE_FLAG = /' game2/gameSource/Makefile
-	sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) /' game2/gameSource/Makefile
-	$(MAKE) -C game2/gameSource CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/games/cultivation\\\""
+	sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' game2/gameSource/Makefile
+	sed -i -e 's/^LINK_FLAGS = /LINK_FLAGS = $$(LDFLAGS) /' game2/gameSource/Makefile
+	$(MAKE) -C game2/gameSource LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/games/cultivation\\\""
 
 override_dh_auto_clean:
 	[ ! -f game2/gameSource/Makefile ] || $(MAKE) -C game2/gameSource clean