r14259 - in packages/trunk/7kaa/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2013-06-16 19:36:07 +0000 (Sun, 16 Jun 2013)
New Revision: 14259

Modified:
   packages/trunk/7kaa/debian/changelog
   packages/trunk/7kaa/debian/control
   packages/trunk/7kaa/debian/patches/abs_dir.patch
   packages/trunk/7kaa/debian/rules
   packages/trunk/7kaa/debian/watch
Log:
New upstream release

Modified: packages/trunk/7kaa/debian/changelog
===================================================================
--- packages/trunk/7kaa/debian/changelog	2013-06-13 18:40:49 UTC (rev 14258)
+++ packages/trunk/7kaa/debian/changelog	2013-06-16 19:36:07 UTC (rev 14259)
@@ -1,3 +1,16 @@
+7kaa (2.14.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add myself to uploaders.
+  * Remove quilt build-dep as package is format 3.0 (quilt).
+  * Add build-arch and build-indep targets in rules.
+  * Add dpkg-dev build-dep for hardening includes.
+    + Manually add relro to LDLFAGS in rules for now.
+  * Fix watch file.
+  * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org>  Sun, 16 Jun 2013 10:33:37 -0400
+
 7kaa (2.14.3-1) unstable; urgency=low
 
   [ Bertrand Marc ]

Modified: packages/trunk/7kaa/debian/control
===================================================================
--- packages/trunk/7kaa/debian/control	2013-06-13 18:40:49 UTC (rev 14258)
+++ packages/trunk/7kaa/debian/control	2013-06-16 19:36:07 UTC (rev 14259)
@@ -2,10 +2,10 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Bertrand Marc <beberking at gmail.com>, Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7.0.50~), dh-buildinfo, quilt, autotools-dev,
+Uploaders: Bertrand Marc <beberking at gmail.com>, Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), dh-buildinfo, autotools-dev,
  libsdl1.2-dev, libsdl-net1.2-dev, libopenal-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.4
 Homepage: http://www.7kfans.com/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/7kaa/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/7kaa/

Modified: packages/trunk/7kaa/debian/patches/abs_dir.patch
===================================================================
--- packages/trunk/7kaa/debian/patches/abs_dir.patch	2013-06-13 18:40:49 UTC (rev 14258)
+++ packages/trunk/7kaa/debian/patches/abs_dir.patch	2013-06-16 19:36:07 UTC (rev 14259)
@@ -1,3 +1,5 @@
+Author: Unknown
+Description: Hardcode game data paths.
 --- 7kaa-2.14.3.orig/include/GAMEDEF.h
 +++ 7kaa-2.14.3/include/GAMEDEF.h
 @@ -53,17 +53,17 @@

Modified: packages/trunk/7kaa/debian/rules
===================================================================
--- packages/trunk/7kaa/debian/rules	2013-06-13 18:40:49 UTC (rev 14258)
+++ packages/trunk/7kaa/debian/rules	2013-06-16 19:36:07 UTC (rev 14259)
@@ -13,10 +13,12 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 config: config-stamp
 config-stamp: 
 	dh_testdir
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
 	dh_autotools-dev_updateconfig
 	./configure $(CROSS) \
 		--prefix=/usr \
@@ -27,10 +29,12 @@
 		--infodir=\$${prefix}/share/info \
 		--disable-silent-rules \
 		CFLAGS="$(CFLAGS)" \
-		LDFLAGS="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined"
+		LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,--as-needed -Wl,--no-undefined"
 	touch $@
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: config
 	dh_testdir
 	$(MAKE)
@@ -43,7 +47,6 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_autotools-dev_restoreconfig
 	rm -fv config.log
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
 install: build

Modified: packages/trunk/7kaa/debian/watch
===================================================================
--- packages/trunk/7kaa/debian/watch	2013-06-13 18:40:49 UTC (rev 14258)
+++ packages/trunk/7kaa/debian/watch	2013-06-16 19:36:07 UTC (rev 14259)
@@ -1,10 +1,5 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 3 file
 version=3
-http://sf.net/skfans/7kaa-([0-9].*)\.tar\.bz2
+http://sf.net/skfans/7kaa-source-([0-9].*)\.tar\.bz2