[SCM] clone of the legendary first person shooter Doom branch, master, updated. upstream/2.5.0+dfsg1-19-g1125a27

[Jon Dowland]

The following commit has been merged in the master branch:
commit 89af1ded9dc0b2741805943274612047e21877a4
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Sep 3 15:42:33 2010 +0100

    stop using quilt

diff --git a/debian/control b/debian/control
index a721267..5ffd4cc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Jon Dowland <jmtd at debian.org>, Stuart Teasdale <sdt at debian.org>
-Build-Depends: debhelper (>= 7), libsdl1.2-dev (>= 1.2.11), libsmpeg-dev (>= 0.4.5), libsdl-mixer1.2-dev (>= 1.2.6), libsdl-net1.2-dev (>= 1.2.5), quilt
+Build-Depends: debhelper (>= 7), libsdl1.2-dev (>= 1.2.11), libsmpeg-dev (>= 0.4.5), libsdl-mixer1.2-dev (>= 1.2.6), libsdl-net1.2-dev (>= 1.2.5)
 Standards-Version: 3.9.1
 Homepage: http://prboom.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-games/prboom.git
diff --git a/debian/patches/do_not_rebuild_prboom.wad.patch b/debian/patches/do_not_rebuild_prboom.wad.patch
deleted file mode 100644
index 67851c6..0000000
--- a/debian/patches/do_not_rebuild_prboom.wad.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-do not rebuild prboom.wad
-
---- prboom-2.5.0+dfsg1/data/Makefile.in.orig	2008-11-09 19:22:16.000000000 +0000
-+++ prboom-2.5.0+dfsg1/data/Makefile.in	2008-11-10 22:45:26.000000000 +0000
-@@ -355,8 +355,8 @@
- 
- 
- prboom.wad      :       prboom.txt $(wildcard graphics/*.ppm sprites/*.ppm lumps/*.lmp sounds/*.wav)
--	-rm -f $@
--	deutex -make prboom.txt $@
-+#	-rm -f $@
-+#	deutex -make prboom.txt $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- prboom-2.5.0+dfsg1/data/Makefile.am.orig	2008-10-11 13:10:37.000000000 +0100
-+++ prboom-2.5.0+dfsg1/data/Makefile.am	2008-11-10 22:45:26.000000000 +0000
-@@ -8,5 +8,5 @@
- MAINTAINERCLEANFILES=prboom.wad
- 
- prboom.wad      :       prboom.txt $(wildcard graphics/*.ppm sprites/*.ppm lumps/*.lmp sounds/*.wav)
--	-rm -f $@
--	deutex -make prboom.txt $@
-+#	-rm -f $@
-+#	deutex -make prboom.txt $@
diff --git a/debian/patches/explain_no_iwad.patch b/debian/patches/explain_no_iwad.patch
deleted file mode 100644
index 469c08b..0000000
--- a/debian/patches/explain_no_iwad.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Add some explanatory text to the error message that occurs
-if you do not have a suitable IWAD.  If we relax the 
-doom-wad dependency to a Depends:, this may be necessary.
-
-                            -- Jon Dowland <jon at alcopop.org>
---- a/src/d_main.c~	2006-11-19 17:44:42.000000000 +0000
-+++ b/src/d_main.c	2008-07-21 17:49:22.000000000 +0100
-@@ -841,7 +841,11 @@
-     free(iwad);
-   }
-   else
--    I_Error("IdentifyVersion: IWAD not found\n");
-+    I_Error("IdentifyVersion: IWAD not found\n"
-+        "prboom requires a doom data (\"IWAD\") file to use.\n"
-+        "please install one, either freedoom or a package built\n"
-+        "using game-data-packager.\n"
-+    );
- }
- 
- 
diff --git a/debian/patches/readme_customization.patch b/debian/patches/readme_customization.patch
deleted file mode 100644
index f998664..0000000
--- a/debian/patches/readme_customization.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Minor Debian customisation
-
---- prboom-2.4.7+dfsg.orig/README
-+++ prboom-2.4.7+dfsg/README
-@@ -92,7 +92,7 @@
- prboom -width 640 -height 400
- 
- sets the resolution. This setting is remembered for future sessions. For
--other parameters, see the included README.command-line.
-+other parameters, see the manpages.
- 
- You may also wish to customise the key bindings. PrBoom's default keybindings
- are the same as the original Doom; unlike original Doom, you can change key
-@@ -232,7 +232,7 @@
- 
- SDL_VIDEODRIVER=fbcon prboom
- or
--SDL_VIDEODRIVER=svga prboom
-+SDL_VIDEODRIVER=svgalib prboom
- 
- Details
- -------
-@@ -242,9 +242,6 @@
- README.demos		provides a guide to PrBoom's demo support
- README.compatibility	describes PrBoom's various compatibility
- 			options and modes
--README.command-line	gives a command line reference for prboom,
--			prboom-game-server, and the format of boom.cfg.
--			On UNIX/Linux systems use the man pages instead.
- 
- Editing features are not covered in the docs with this package. We plan
- to bundle the editing docs as a separate download. Watch our website
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b5631c2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-do_not_rebuild_prboom.wad.patch
-readme_customization.patch
-explain_no_iwad.patch
diff --git a/debian/rules b/debian/rules
index 94fbb50..5866956 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,6 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	# Add here commands to configure the package.
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --disable-cpu-opt --disable-dogs \
 		LDFLAGS="-Wl,--as-needed -Wl,-z,defs"
 #	--host=$(DEB_HOST_GNU_TYPE) --target=$(DEB_BUILD_GNU_TYPE) \
@@ -38,7 +36,6 @@ clean:
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 
 	dh_clean
 	rm -f config.log

-- 
clone of the legendary first person shooter Doom