r9073 - in packages/trunk/gravitation/debian: . patches

Sun Mar 8 06:27:23 UTC 2009

Author: pabs
Date: 2009-03-08 06:27:23 +0000 (Sun, 08 Mar 2009)
New Revision: 9073

Modified:
   packages/trunk/gravitation/debian/changelog
   packages/trunk/gravitation/debian/compat
   packages/trunk/gravitation/debian/control
   packages/trunk/gravitation/debian/gravitation.6
   packages/trunk/gravitation/debian/gravitation.desktop
   packages/trunk/gravitation/debian/patches/abs_path.patch
   packages/trunk/gravitation/debian/rules
   packages/trunk/gravitation/debian/watch
Log:
add passage changes to gravitation

Modified: packages/trunk/gravitation/debian/changelog
===================================================================

--- packages/trunk/gravitation/debian/changelog	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/changelog	2009-03-08 06:27:23 UTC (rev 9073)
@@ -2,6 +2,14 @@
 
   [ Paul Wise ]
   * Document using the Esc key to quit the game
+  * 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
+  * Add proper version mangling to the watch file
+  * Bump debhelper compat level to 7
+  * Add forwarded locations to patch, menu, manual page
 
   [ Cyril Brulebois ]
   * Fix FTBFS with new “3.0 (quilt)” source package format by using a
@@ -9,7 +17,7 @@
     adjusting the series file appropriately (i.e. by deleting the “-p0”
     option), thanks to Raphaël Hertzog for the notice (Closes: #485257).
 
- -- Paul Wise <pabs at debian.org>  Wed, 26 Mar 2008 18:36:40 +0900
+ -- Paul Wise <pabs at debian.org>  Sun, 08 Mar 2009 15:18:03 +0900
 
 gravitation (3+dfsg1-1) unstable; urgency=low
 

Modified: packages/trunk/gravitation/debian/compat
===================================================================
--- packages/trunk/gravitation/debian/compat	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/compat	2009-03-08 06:27:23 UTC (rev 9073)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/gravitation/debian/control
===================================================================
--- packages/trunk/gravitation/debian/control	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/control	2009-03-08 06:27:23 UTC (rev 9073)
@@ -3,8 +3,8 @@
 Priority: extra
 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
+Build-Depends: debhelper (>= 7), quilt, libsdl1.2-dev
+Standards-Version: 3.8.0
 Homepage: http://hcsoftware.sourceforge.net/gravitation/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gravitation/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gravitation/?op=log

Modified: packages/trunk/gravitation/debian/gravitation.6
===================================================================
--- packages/trunk/gravitation/debian/gravitation.6	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/gravitation.6	2009-03-08 06:27:23 UTC (rev 9073)
@@ -1,4 +1,5 @@
 .\" Placed in the public domain by Paul Wise <pabs at debian.org>
+.\" Forwarded to http://sf.net/support/tracker.php?aid=2672137
 .TH "gravitation" "6" "March 2008" "" "Games"
 .SH "NAME"
 gravitation \- a game about mania, melancholia, and the creative process.

Modified: packages/trunk/gravitation/debian/gravitation.desktop
===================================================================
--- packages/trunk/gravitation/debian/gravitation.desktop	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/gravitation.desktop	2009-03-08 06:27:23 UTC (rev 9073)
@@ -1,3 +1,4 @@
+# Forwarded to http://sf.net/support/tracker.php?aid=2672143
 [Desktop Entry]
 Type=Application
 Name=Gravitation

Modified: packages/trunk/gravitation/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/gravitation/debian/patches/abs_path.patch	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/patches/abs_path.patch	2009-03-08 06:27:23 UTC (rev 9073)
@@ -2,6 +2,7 @@
 Paul Wise <pabs at debian.org>
 Placed in the Public Domain
 Use absolute paths to the installed data files.
+Forwarded to http://sf.net/support/tracker.php?aid=2672133
 --- a/game5/gameSource/common.cpp
 +++ b/game5/gameSource/common.cpp
 @@ -10,7 +10,7 @@

Modified: packages/trunk/gravitation/debian/rules
===================================================================
--- packages/trunk/gravitation/debian/rules	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/rules	2009-03-08 06:27:23 UTC (rev 9073)
@@ -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 game5/gameSource/configure
 	cd game5/gameSource && platformSelection=1 ./configure
 	touch $@
@@ -39,13 +45,12 @@
 	rm -f game5/gameSource/Makefile.dependencies.temp
 	rm -f game5/gameSource/Makefile.dependencies
 	rm -f game5/gameSource/Makefile
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 
 binary-indep: build install

Modified: packages/trunk/gravitation/debian/watch
===================================================================
--- packages/trunk/gravitation/debian/watch	2009-03-08 05:57:36 UTC (rev 9072)
+++ packages/trunk/gravitation/debian/watch	2009-03-08 06:27:23 UTC (rev 9073)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/hcsoftware/Gravitation_v(.*)_UnixSource\.tar\.gz
+opts=dversionmangle=s/\+dfsg[0-9]*// http://sf.net/hcsoftware/Gravitation_v(.*)_UnixSource\.tar\.gz


