r5335 - in packages/trunk/funguloids/debian: . patches

Andres Mejia ceros-guest at alioth.debian.org
Mon Jan 14 06:33:04 UTC 2008


Author: ceros-guest
Date: 2008-01-14 06:33:03 +0000 (Mon, 14 Jan 2008)
New Revision: 5335

Added:
   packages/trunk/funguloids/debian/patches/makefile_modifications.diff
   packages/trunk/funguloids/debian/patches/series
Removed:
   packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch
   packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch
Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/control
   packages/trunk/funguloids/debian/rules
Log:
Switch from dpatch to quilt.

Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2008-01-14 06:19:16 UTC (rev 5334)
+++ packages/trunk/funguloids/debian/changelog	2008-01-14 06:33:03 UTC (rev 5335)
@@ -32,6 +32,7 @@
   * Providing another scan for watchfile.
   * Give exact link used to download upstream tarball in copyright file.
   * Provide get-orig-source rule.
+  * Switch from dpatch to quilt.
 
  -- Andres Mejia <mcitadel at gmail.com>  Sat, 12 Jan 2008 00:46:39 -0500
 

Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control	2008-01-14 06:19:16 UTC (rev 5334)
+++ packages/trunk/funguloids/debian/control	2008-01-14 06:33:03 UTC (rev 5335)
@@ -3,7 +3,7 @@
 Section: contrib/games
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, automake, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
+Build-Depends: debhelper (>= 5), quilt, automake, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funguloids/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/funguloids/?op=log

Deleted: packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch
===================================================================
--- packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch	2008-01-14 06:19:16 UTC (rev 5334)
+++ packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch	2008-01-14 06:33:03 UTC (rev 5335)
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## disable_ogre-plugins-cgprogrammanager.dpatch by Andres Mejia
-## <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This is used for disabling CgProgramManager on unsupported archs.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- bin/plugins.cfg.in~	2007-07-08 01:48:31.000000000 -0400
-+++ bin/plugins.cfg.in	2007-07-08 01:49:14.000000000 -0400
-@@ -7,6 +7,5 @@
- Plugin=RenderSystem_GL
- Plugin=Plugin_ParticleFX
- Plugin=Plugin_OctreeSceneManager
--Plugin=Plugin_CgProgramManager
- 
- 

Copied: packages/trunk/funguloids/debian/patches/makefile_modifications.diff (from rev 5334, packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch)
===================================================================
--- packages/trunk/funguloids/debian/patches/makefile_modifications.diff	                        (rev 0)
+++ packages/trunk/funguloids/debian/patches/makefile_modifications.diff	2008-01-14 06:33:03 UTC (rev 5335)
@@ -0,0 +1,38 @@
+--- bin/music/Makefile.am~	2007-06-23 18:03:05.000000000 -0400
++++ bin/music/Makefile.am	2007-06-23 18:04:00.000000000 -0400
+@@ -1,12 +1,10 @@
+-musicinstall_DATA = playlist.lua
++musicinstall_DATA = playlist.lua MarylandInMay.ogg
+ 
+ EXTRA_DIST = playlist.lua.in
+ 
+ playlist.lua: playlist.lua.in
+ 	cat playlist.lua.in | sed 's,%%musicinstalldir%%, at musicinstalldir@,' > playlist.lua
+ 
+-install-data-hook:
+-	if test -r MarylandInMay.ogg; then cp MarylandInMay.ogg "@musicinstalldir@"; fi;
+ 
+ 
+ distclean: clean
+--- bin/Makefile.am~	2007-06-23 18:36:56.000000000 -0400
++++ bin/Makefile.am	2007-06-23 18:39:50.000000000 -0400
+@@ -4,7 +4,7 @@
+ dist_pixmapinstall_DATA = funguloids.png
+ dist_gameinstall_DATA = gamesettings.cfg
+ dist_docinstall_DATA = readme.html
+-gameinstall_DATA = plugins.cfg resources.cfg
++gameinstall_DATA = plugins.cfg resources.cfg bootstrap.mpk funguloids.mpk
+ 
+ plugins.cfg: plugins.cfg.in
+ 	cat plugins.cfg.in | sed 's,%%ogreplugindir%%, at ogreplugindir@/,' > plugins.cfg
+@@ -22,9 +22,7 @@
+ 		if test ! -e "@highscoredir@/hiscore.lst"; then cp hiscore.lst.in "@highscoredir@/hiscore.lst"; fi; \
+ 		chgrp -R @highscoregroup@ "@highscoredir@"; \
+ 		chmod -R g+w "@highscoredir@"; \
+-	fi; \
+-	if test -r bootstrap.mpk; then cp bootstrap.mpk "@gameinstalldir@"; fi; \
+-	if test -r funguloids.mpk; then cp funguloids.mpk "@gameinstalldir@"; fi
++	fi
+ 
+ uninstall-hook:
+ 	rm -rf "@docinstalldir@"

Deleted: packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch	2008-01-14 06:19:16 UTC (rev 5334)
+++ packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch	2008-01-14 06:33:03 UTC (rev 5335)
@@ -1,67 +0,0 @@
-#! /bin/sh -e
-## makefile_modifications.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch that modifies some makefiles.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
-## DP: Patch to install music files using DESTDIR.
---- bin/music/Makefile.am~	2007-06-23 18:03:05.000000000 -0400
-+++ bin/music/Makefile.am	2007-06-23 18:04:00.000000000 -0400
-@@ -1,12 +1,10 @@
--musicinstall_DATA = playlist.lua
-+musicinstall_DATA = playlist.lua MarylandInMay.ogg
- 
- EXTRA_DIST = playlist.lua.in
- 
- playlist.lua: playlist.lua.in
- 	cat playlist.lua.in | sed 's,%%musicinstalldir%%, at musicinstalldir@,' > playlist.lua
- 
--install-data-hook:
--	if test -r MarylandInMay.ogg; then cp MarylandInMay.ogg "@musicinstalldir@"; fi;
- 
- 
- distclean: clean
-## DP: Patch to install data files using DESTDIR.
---- bin/Makefile.am~	2007-06-23 18:36:56.000000000 -0400
-+++ bin/Makefile.am	2007-06-23 18:39:50.000000000 -0400
-@@ -4,7 +4,7 @@
- dist_pixmapinstall_DATA = funguloids.png
- dist_gameinstall_DATA = gamesettings.cfg
- dist_docinstall_DATA = readme.html
--gameinstall_DATA = plugins.cfg resources.cfg
-+gameinstall_DATA = plugins.cfg resources.cfg bootstrap.mpk funguloids.mpk
- 
- plugins.cfg: plugins.cfg.in
- 	cat plugins.cfg.in | sed 's,%%ogreplugindir%%, at ogreplugindir@/,' > plugins.cfg
-@@ -22,9 +22,7 @@
- 		if test ! -e "@highscoredir@/hiscore.lst"; then cp hiscore.lst.in "@highscoredir@/hiscore.lst"; fi; \
- 		chgrp -R @highscoregroup@ "@highscoredir@"; \
- 		chmod -R g+w "@highscoredir@"; \
--	fi; \
--	if test -r bootstrap.mpk; then cp bootstrap.mpk "@gameinstalldir@"; fi; \
--	if test -r funguloids.mpk; then cp funguloids.mpk "@gameinstalldir@"; fi
-+	fi
- 
- uninstall-hook:
- 	rm -rf "@docinstalldir@"

Added: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series	                        (rev 0)
+++ packages/trunk/funguloids/debian/patches/series	2008-01-14 06:33:03 UTC (rev 5335)
@@ -0,0 +1 @@
+makefile_modifications.diff

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2008-01-14 06:19:16 UTC (rev 5334)
+++ packages/trunk/funguloids/debian/rules	2008-01-14 06:33:03 UTC (rev 5335)
@@ -28,7 +28,7 @@
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
-	dpatch apply makefile_modifications
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch patch-stamp
 
 configure: patch configure-stamp
@@ -59,9 +59,7 @@
 
 unpatch:
 	dh_testdir
-	dh_testroot
-	dpatch deapply makefile_modifications
-	[ ! -d debian/patched ] || rm -r debian/patched
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	[ ! -f patch-stamp ] || rm patch-stamp
 
 install: build




More information about the Pkg-games-commits mailing list