r9396 - packages/trunk/cookietool/debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-04-04 13:31:26 +0000 (Sat, 04 Apr 2009)
New Revision: 9396

Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/control
   packages/trunk/cookietool/debian/rules
Log:
Use the build hardening wrapper unless "nohardening" is in DEB_BUILD_OPTIONS.


Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2009-04-04 13:25:46 UTC (rev 9395)
+++ packages/trunk/cookietool/debian/changelog	2009-04-04 13:31:26 UTC (rev 9396)
@@ -26,6 +26,8 @@
   * Add the 04-compiler-warnings patch to fix some compiler warnings.
   * Reorder the dh_* invocations in the "install" and "binary-arch"
     targets just the way the dh(1) helper tool would do
+  * Use the build hardening wrapper unless "nohardening" is specified
+    in DEB_BUILD_OPTIONS.
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 03 Apr 2009 16:18:42 +0300
 

Modified: packages/trunk/cookietool/debian/control
===================================================================
--- packages/trunk/cookietool/debian/control	2009-04-04 13:25:46 UTC (rev 9395)
+++ packages/trunk/cookietool/debian/control	2009-04-04 13:31:26 UTC (rev 9396)
@@ -1,7 +1,7 @@
 Source: cookietool
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 7), quilt
+Build-Depends: debhelper (>= 7), quilt, hardening-wrapper
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.8.1

Modified: packages/trunk/cookietool/debian/rules
===================================================================
--- packages/trunk/cookietool/debian/rules	2009-04-04 13:25:46 UTC (rev 9395)
+++ packages/trunk/cookietool/debian/rules	2009-04-04 13:31:26 UTC (rev 9396)
@@ -11,6 +11,11 @@
 	CFLAGS+=	-Werror
 endif
 export CFLAGS
+ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
+export DEB_BUILD_HARDENING=1
+else
+export DEB_BUILD_HARDENING=0
+endif
 
 override_dh_auto_configure:	${QUILT_STAMPFN}