r9067 - packages/trunk/passage/debian

[Paul Wise]

Author: pabs
Date: 2009-03-08 05:06:29 +0000 (Sun, 08 Mar 2009)
New Revision: 9067

Added:
   packages/trunk/passage/debian/README.source
Modified:
   packages/trunk/passage/debian/changelog
   packages/trunk/passage/debian/control
   packages/trunk/passage/debian/rules
Log:
* Update Standards-Version, changes needed are:
  - include quilt.make to create a patch target
  - use filter instead of findstring on DEB_BUILD_OPTIONS
  - support parallel=n in DEB_BUILD_OPTIONS 
  - add a README.source file pointing to the quilt one

Added: packages/trunk/passage/debian/README.source
===================================================================
--- packages/trunk/passage/debian/README.source	                        (rev 0)
+++ packages/trunk/passage/debian/README.source	2009-03-08 05:06:29 UTC (rev 9067)
@@ -0,0 +1,2 @@
+This package uses quilt for patch management, for more information see
+the file /usr/share/doc/quilt/README.source in the quilt package.

Modified: packages/trunk/passage/debian/changelog
===================================================================
--- packages/trunk/passage/debian/changelog	2009-03-08 02:44:21 UTC (rev 9066)
+++ packages/trunk/passage/debian/changelog	2009-03-08 05:06:29 UTC (rev 9067)
@@ -1,10 +1,18 @@
-passage (3+dfsg1-3) unstable; urgency=low
+passage (3+dfsg1-3) UNRELEASED; urgency=low
 
+  [ Cyril Brulebois ]
   * Fix FTBFS with new “3.0 (quilt)” source package format by using a
     patch level of 1 instead of 0 in the patches and by adjusting the
     series file appropriately (i.e. by deleting the “-p0” option),
     thanks to Raphaël Hertzog for the notice (Closes: #485262).
 
+  [ Paul Wise ]
+  * Update Standards-Version, changes needed are:
+    - include quilt.make to create a patch target
+    - use filter instead of findstring on DEB_BUILD_OPTIONS
+    - support parallel=n in DEB_BUILD_OPTIONS 
+    - add a README.source file pointing to the quilt one
+
  -- Cyril Brulebois <kibi at debian.org>  Wed, 11 Jun 2008 03:38:20 +0200
 
 passage (3+dfsg1-2) unstable; urgency=low

Modified: packages/trunk/passage/debian/control
===================================================================
--- packages/trunk/passage/debian/control	2009-03-08 02:44:21 UTC (rev 9066)
+++ packages/trunk/passage/debian/control	2009-03-08 05:06:29 UTC (rev 9067)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
 Uploaders: Paul Wise <pabs at debian.org>
 Build-Depends: debhelper (>= 5.0.51~), quilt, libsdl1.2-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://hcsoftware.sourceforge.net/passage/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/passage/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/passage/?op=log

Modified: packages/trunk/passage/debian/rules
===================================================================
--- packages/trunk/passage/debian/rules	2009-03-08 02:44:21 UTC (rev 9066)
+++ packages/trunk/passage/debian/rules	2009-03-08 05:06:29 UTC (rev 9067)
@@ -3,18 +3,24 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	chmod u+x gamma256/gameSource/configure
 	cd gamma256/gameSource && platformSelection=1 ./configure
 	touch $@
@@ -26,7 +32,7 @@
 	mv gamma256/gameSource/Passage gamma256/gameSource/passage
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -39,7 +45,6 @@
 	rm -f gamma256/gameSource/Makefile.dependencies.temp
 	rm -f gamma256/gameSource/Makefile.dependencies
 	rm -f gamma256/gameSource/Makefile
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build