r3786 - in packages/trunk/chocolate-doom: . debian debian/patches

[Jon Dowland]

Author: jmtd-guest
Date: 2007-08-23 16:49:40 +0000 (Thu, 23 Aug 2007)
New Revision: 3786

Added:
   packages/trunk/chocolate-doom/debian/patches/
   packages/trunk/chocolate-doom/debian/patches/escape_backslash.patch
   packages/trunk/chocolate-doom/debian/patches/remove_manpage_on_clean.patch
   packages/trunk/chocolate-doom/debian/patches/series
Removed:
   packages/trunk/chocolate-doom/man/
Modified:
   packages/trunk/chocolate-doom/debian/changelog
   packages/trunk/chocolate-doom/debian/control
   packages/trunk/chocolate-doom/debian/rules
Log:
use quilt for patch management


Modified: packages/trunk/chocolate-doom/debian/changelog
===================================================================
--- packages/trunk/chocolate-doom/debian/changelog	2007-08-23 16:43:15 UTC (rev 3785)
+++ packages/trunk/chocolate-doom/debian/changelog	2007-08-23 16:49:40 UTC (rev 3786)
@@ -12,5 +12,6 @@
 
   [ Jon Dowland ]
   * use autotools-dev config.guess/sub to keep the diff.gz clean
+  * use quilt for patch management
 
- -- Jon Dowland <jon at alcopop.org>  Thu, 23 Aug 2007 18:36:08 +0100
+ -- Jon Dowland <jon at alcopop.org>  Thu, 23 Aug 2007 18:40:52 +0100

Modified: packages/trunk/chocolate-doom/debian/control
===================================================================
--- packages/trunk/chocolate-doom/debian/control	2007-08-23 16:43:15 UTC (rev 3785)
+++ packages/trunk/chocolate-doom/debian/control	2007-08-23 16:49:40 UTC (rev 3786)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Jon Dowland <jon at alcopop.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-net1.2-dev (>= 1.2.0-5.1), m4
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev (>= 1.2.0-1.1), libsdl-net1.2-dev (>= 1.2.0-5.1), m4, quilt
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/chocolate-doom/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/chocolate-doom/?op=log

Added: packages/trunk/chocolate-doom/debian/patches/escape_backslash.patch
===================================================================
--- packages/trunk/chocolate-doom/debian/patches/escape_backslash.patch	                        (rev 0)
+++ packages/trunk/chocolate-doom/debian/patches/escape_backslash.patch	2007-08-23 16:49:40 UTC (rev 3786)
@@ -0,0 +1,13 @@
+Escape a backslash
+
+--- chocolate-doom-0.1.4.orig/man/doom-options.in
++++ chocolate-doom-0.1.4/man/doom-options.in
+@@ -2,7 +2,7 @@
+ -altdeath	start a deathmatch game (alternative mode)
+ -timer x	exit a deathmatch level after x minutes
+ -avg	austin virtual gaming (same as -timer 20)
+--cdrom	use C:\DOOMDATA for configuration data
++-cdrom	use C:\\DOOMDATA for configuration data
+ -config x	use x as the configuration file
+ -devparm	developer mode: F1 saves a PCX screenshot in the current working directory
+ -dup	put two network commands in each network packet

Added: packages/trunk/chocolate-doom/debian/patches/remove_manpage_on_clean.patch
===================================================================
--- packages/trunk/chocolate-doom/debian/patches/remove_manpage_on_clean.patch	                        (rev 0)
+++ packages/trunk/chocolate-doom/debian/patches/remove_manpage_on_clean.patch	2007-08-23 16:49:40 UTC (rev 3786)
@@ -0,0 +1,11 @@
+remove the generated manpage on clean
+
+--- chocolate-doom-0.1.4.orig/man/Makefile
++++ chocolate-doom-0.1.4/man/Makefile
+@@ -6,3 +6,6 @@
+ 	echo .SH CHOCOLATE\\-DOOM OPTIONS >> $@
+ 	awk -F"\t" '{print ".TP\n\\fB"$$1"\\fR"; $$1=""; print }' < chocolate-doom-options.in >>$@
+ 	m4 -DAUTHORS="`cat ../AUTHORS`" foot >> $@
++
++clean:
++	rm chocolate-doom.6

Added: packages/trunk/chocolate-doom/debian/patches/series
===================================================================
--- packages/trunk/chocolate-doom/debian/patches/series	                        (rev 0)
+++ packages/trunk/chocolate-doom/debian/patches/series	2007-08-23 16:49:40 UTC (rev 3786)
@@ -0,0 +1,2 @@
+escape_backslash.patch
+remove_manpage_on_clean.patch

Modified: packages/trunk/chocolate-doom/debian/rules
===================================================================
--- packages/trunk/chocolate-doom/debian/rules	2007-08-23 16:43:15 UTC (rev 3785)
+++ packages/trunk/chocolate-doom/debian/rules	2007-08-23 16:49:40 UTC (rev 3786)
@@ -2,6 +2,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -17,6 +19,9 @@
 
 config.status: configure
 	dh_testdir
+	
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	
 	ln -sf /usr/share/misc/config.sub ./autotools/config.sub
 	ln -sf /usr/share/misc/config.guess ./autotools/config.guess
 	rm -f config.cache
@@ -35,15 +40,17 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
+	
 	-$(MAKE) distclean
-
+	
 	# stuff we don't want in diff.gz
 	find -name config.sub   -print0 | xargs -0 -r rm -f \;
 	find -name config.guess -print0 | xargs -0 -r rm -f \;
+	
+	-cd man && $(MAKE) clean
 
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
-	-cd man && $(MAKE) clean
 
 install: build
 	dh_testdir