r14618 - packages/trunk/alex4/debian

[Jackson Doak]

Author: noskcaj-guest
Date: 2013-09-27 09:05:53 +0000 (Fri, 27 Sep 2013)
New Revision: 14618

Modified:
   packages/trunk/alex4/debian/changelog
   packages/trunk/alex4/debian/compat
   packages/trunk/alex4/debian/control
   packages/trunk/alex4/debian/rules
Log:
Use debhelper 9 and associated hardening

Modified: packages/trunk/alex4/debian/changelog
===================================================================
--- packages/trunk/alex4/debian/changelog	2013-09-22 22:29:17 UTC (rev 14617)
+++ packages/trunk/alex4/debian/changelog	2013-09-27 09:05:53 UTC (rev 14618)
@@ -1,3 +1,13 @@
+alex4 (1.1-7) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Bump debhelper to 9
+    - drop build-depends on hardening-includes
+  * debian/compat: set as 9
+  * debian/rules: Use simpler hardening commands
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Fri, 27 Sep 2013 19:03:20 +1000
+
 alex4 (1.1-6) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/alex4/debian/compat
===================================================================
--- packages/trunk/alex4/debian/compat	2013-09-22 22:29:17 UTC (rev 14617)
+++ packages/trunk/alex4/debian/compat	2013-09-27 09:05:53 UTC (rev 14618)
@@ -1 +1 @@
-8
+9

Modified: packages/trunk/alex4/debian/control
===================================================================
--- packages/trunk/alex4/debian/control	2013-09-22 22:29:17 UTC (rev 14617)
+++ packages/trunk/alex4/debian/control	2013-09-27 09:05:53 UTC (rev 14618)
@@ -7,9 +7,9 @@
  Paul Wise <pabs at debian.org>,
  Peter Pentchev <roam at ringlet.net>
 Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
  dpkg-dev (>= 1.15.7~),
- hardening-includes,
+# hardening-includes,
  libaldmb1-dev,
  liballegro4-dev,
  libdumb1-dev

Modified: packages/trunk/alex4/debian/rules
===================================================================
--- packages/trunk/alex4/debian/rules	2013-09-22 22:29:17 UTC (rev 14617)
+++ packages/trunk/alex4/debian/rules	2013-09-27 09:05:53 UTC (rev 14618)
@@ -3,26 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS:=	$(shell dpkg-buildflags --get CFLAGS)
-CPPFLAGS:=	$(shell dpkg-buildflags --get CPPFLAGS)
-LDFLAGS:=	$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-CFLAGS+=	-Wall -W -Wbad-function-cast \
-		-Wcast-align -Wcast-qual -Wchar-subscripts -Winline \
-		-Wnested-externs -Wpointer-arith \
-		-Wredundant-decls -Wwrite-strings
-ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
-	CFLAGS+=	-Werror
-endif
-
-include /usr/share/hardening-includes/hardening.make
-ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
-CFLAGS+=	$(HARDENING_CFLAGS)
-LDFLAGS+=	$(HARDENING_LDFLAGS)
-endif
-
-export CPPFLAGS CFLAGS LDFLAGS
-
 override_dh_auto_build:
 	dh_auto_build -D src -- DATADIR=/usr/share/games/alex4