r7604 - in packages/branches/game-package/support_quake3: ! dirs' list truncated !

Jon Dowland jmtd-guest at alioth.debian.org
Mon Jun 30 09:36:43 UTC 2008


Author: jmtd-guest
Date: 2008-06-30 09:36:43 +0000 (Mon, 30 Jun 2008)
New Revision: 7604

Modified:
   packages/branches/game-package/support_quake3/Makefile
   packages/branches/game-package/support_quake3/changelog
   packages/branches/game-package/support_quake3/debian/TODO
   packages/branches/game-package/support_quake3/debian/changelog
   packages/branches/game-package/support_quake3/debian/control
   packages/branches/game-package/support_quake3/debian/game-package.install
   packages/branches/game-package/support_quake3/debian/rules
   packages/branches/game-package/support_quake3/doom-wad/DEBIAN/control
   packages/branches/game-package/support_quake3/doom-wad/DEBIAN/postinst
   packages/branches/game-package/support_quake3/doom-wad/usr/share/applications/doom-wad.desktop
   packages/branches/game-package/support_quake3/doom-wad/usr/share/pixmaps/doom.xpm
   packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/control
   packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/postinst
   packages/branches/game-package/support_quake3/doom2-wad/usr/share/pixmaps/doom2.xpm
   packages/branches/game-package/support_quake3/etc/game-package.conf
   packages/branches/game-package/support_quake3/game-package
   packages/branches/game-package/support_quake3/lib/game-package-shared
   packages/branches/game-package/support_quake3/supported/doom
   packages/branches/game-package/support_quake3/supported/doom2
Log:
merge changes from trunk since we branched off

Modified: packages/branches/game-package/support_quake3/Makefile
===================================================================
--- packages/branches/game-package/support_quake3/Makefile	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/Makefile	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,16 +1,9 @@
-BINDIR=$(DESTDIR)/usr/games
-DATADIR=$(DESTDIR)/usr/share/games/game-package
-MANDIR=$(DESTDIR)/usr/share/man
-
 QUAKE3VER=$(word 2, $(shell grep '^Version' quake3-data/DEBIAN/control))
 QUAKE3DEB=quake3-data_$(QUAKE3VER)_all.deb
-DOOM2VER=$(word 2, $(shell grep '^Version' doom2-wad/DEBIAN/control))
-DOOM2DEB=doom2-wad_$(DOOM2VER)_all.deb
-DOOMVER=$(word 2, $(shell grep '^Version' doom-wad/DEBIAN/control))
-DOOMDEB=doom-wad_$(DOOMVER)_all.deb
+DOOM2DEB=doom2-wad_$(VERSION)_all.deb
+DOOMDEB=doom-wad_$(VERSION)_all.deb
 
 # general targets ############################################################
-
 default: $(DOOM2DEB) $(QUAKE3DEB) $(DOOMDEB)
 
 # necessary as dpkg-source will honour the shell's umask

Modified: packages/branches/game-package/support_quake3/changelog
===================================================================
--- packages/branches/game-package/support_quake3/changelog	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/changelog	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,14 +0,0 @@
-doom-package (15) UNRELEASED; urgency=low
-
-  * Initial upload. Closes: #280045,  #326813.
-  * update comments in make-wad-package (thanks Ben Hutchings)
-  * remove dummy md5sum and doom2.wad file from package
-    (thanks Ben Hutchings)
-  * auto-generate md5sums in the doom2-wad .deb on build
-  * remove binutils dependency
-  * use Build-Depends, not -Indep (thanks Ben Hutchings)
-  * make-wad-package is a bash script (not sh, yet)
-  * clarify copyright (GPL-2)
-  * use fakeroot again (or doom2-wad will unpack with the wrong uid)
-
- -- Jon Dowland <jon at alcopop.org>  Sun,  1 Oct 2006 19:08:11 +0100

Modified: packages/branches/game-package/support_quake3/debian/TODO
===================================================================
--- packages/branches/game-package/support_quake3/debian/TODO	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/debian/TODO	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,11 +1,13 @@
 TODO:
 
-	* remove bashisms so we can use #!/bin/sh
-	* support {doom,tnt,plutonia}.wad
+	* support {tnt,plutonia}.wad
 	* ensure the doom2.wad is not +x (chmod)
 	* generalize for non-doom games
 		* a more suitable name?
 		* show a licence where necessary
-	
+	* move stuff which is very similar from doom2-wad/doom-wad into
+	* doom-common and make it specific at runtime
+	* do away with ./Makefile and build entirely from debian/rules
+	* re-add quake3 support (currently in a branch)
 					 Jon Dowland <jon at alcopop.org>
-				       Sun, 01 Oct 2006 17:01:02 +0100
+						  Sat Mar 15 18:19:12 GMT 2008

Modified: packages/branches/game-package/support_quake3/debian/changelog
===================================================================
--- packages/branches/game-package/support_quake3/debian/changelog	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/debian/changelog	2008-06-30 09:36:43 UTC (rev 7604)
@@ -2,6 +2,7 @@
 
   [ Jon Dowland ]
   * add a generic game-package binary
+  * rename (again) to game-package
 
   [ Eddy Petrișor ]
   * add missing Vcs-Svn headers
@@ -9,8 +10,18 @@
   [ Jon Dowland ]
   * add support for (ultimate) doom
   * remove make-wad-package and references to it
+  * remove (unfinished; not working) quake3 support
+  * Stop maintaining an "internal" .deb version for
+    the slipstream files, and instead install the
+    game-package changelog into the .debs that that
+    are built.
+  * Start moving functionality out of ./Makefile and
+    into debian/rules
+  * adjust priorities of official IWADs to conform to
+    the doom packaging guidelines
+  * clean up the tempdir used by the slipstream functions
 
- -- Jon Dowland <jon at alcopop.org>  Sat, 15 Mar 2008 14:28:28 +0000
+ -- Jon Dowland <jon at alcopop.org>  Tue, 25 Mar 2008 19:57:39 +0000
 
 games-package (16) unstable; urgency=low
 

Modified: packages/branches/game-package/support_quake3/debian/control
===================================================================
--- packages/branches/game-package/support_quake3/debian/control	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/debian/control	2008-06-30 09:36:43 UTC (rev 7604)
@@ -9,7 +9,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/game-package/?op=log
 
 Package: game-package
-Depends: fakeroot
+Depends: fakeroot, sudo, gdebi
 Conflicts: doom-package
 Replaces: doom-package
 Architecture: all

Modified: packages/branches/game-package/support_quake3/debian/game-package.install
===================================================================
--- packages/branches/game-package/support_quake3/debian/game-package.install	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/debian/game-package.install	2008-06-30 09:36:43 UTC (rev 7604)
@@ -3,5 +3,5 @@
 supported/doom2         usr/share/games/game-package/supported
 supported/doom          usr/share/games/game-package/supported
 etc/game-package.conf   etc
-doom-wad_[0-9]_all.deb  usr/share/games/game-package
-doom2-wad_[0-9]_all.deb usr/share/games/game-package
+doom-wad_*_all.deb      usr/share/games/game-package
+doom2-wad_*_all.deb     usr/share/games/game-package

Modified: packages/branches/game-package/support_quake3/debian/rules
===================================================================
--- packages/branches/game-package/support_quake3/debian/rules	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/debian/rules	2008-06-30 09:36:43 UTC (rev 7604)
@@ -2,23 +2,44 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 #export DH_VERBOSE=1
+VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2-)
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	touch configure-stamp
 
+doom-wad/DEBIAN/control:
+	cp doom-wad/DEBIAN/control.in doom-wad/DEBIAN/control
+	echo Version: $(VERSION) >> doom-wad/DEBIAN/control
+
+doom2-wad/DEBIAN/control:
+	cp doom2-wad/DEBIAN/control.in doom2-wad/DEBIAN/control
+	echo Version: $(VERSION) >> doom2-wad/DEBIAN/control
+
 build: configure-stamp build-stamp
-build-stamp:
+build-stamp: doom-wad/DEBIAN/control doom2-wad/DEBIAN/control
 	dh_testdir
-	$(MAKE)
+	# we build .debs as that are shipped in the binary
+	# package. Insert our changelog into them
+	gzip -c9 debian/changelog > doom-wad/usr/share/doc/doom-wad/changelog.gz
+	gzip -c9 debian/changelog > doom2-wad/usr/share/doc/doom2-wad/changelog.gz
+	cp -p doom-common/doom2.xpm doom2-wad/usr/share/pixmaps
+	cp -p doom-common/doom2.xpm doom-wad/usr/share/pixmaps/doom.xpm
+	$(MAKE) VERSION=$(VERSION)
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	$(MAKE) clean
+	$(MAKE) clean VERSION=$(VERSION)
+	rm -f doom-wad/usr/share/doc/doom-wad/changelog.gz \
+		doom2-wad/usr/share/doc/doom2-wad/changelog.gz \
+		doom2-wad/usr/share/pixmaps/doom2.xpm \
+		doom-wad/usr/share/pixmaps/doom.xpm \
+		doom-wad/DEBIAN/control \
+		doom2-wad/DEBIAN/control
 	dh_clean
 
 install: build

Modified: packages/branches/game-package/support_quake3/doom-wad/DEBIAN/control
===================================================================
--- packages/branches/game-package/support_quake3/doom-wad/DEBIAN/control	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom-wad/DEBIAN/control	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,13 +0,0 @@
-Package: doom-wad
-Version: 7
-Section: non-free/games
-Priority: optional
-Architecture: all
-Recommends: doom-engine
-Provides: doom-wad
-Installed-Size: 56
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Description: IWAD from ID Software's DOOM computer game
- Doom requires both a doom-engine and a doom-wad to play. This package
- contains the IWAD from ID Software's game "DOOM" (or "Ultimate DOOM"),
- and was generated using the "game-package" program.

Modified: packages/branches/game-package/support_quake3/doom-wad/DEBIAN/postinst
===================================================================
--- packages/branches/game-package/support_quake3/doom-wad/DEBIAN/postinst	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom-wad/DEBIAN/postinst	2008-06-30 09:36:43 UTC (rev 7604)
@@ -17,7 +17,7 @@
 			/usr/share/games/doom/doom.wad      \
 			doom.wad                            \
 			/usr/share/games/game-package/doom.wad \
-			25
+			50
 	;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)

Modified: packages/branches/game-package/support_quake3/doom-wad/usr/share/applications/doom-wad.desktop
===================================================================
--- packages/branches/game-package/support_quake3/doom-wad/usr/share/applications/doom-wad.desktop	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom-wad/usr/share/applications/doom-wad.desktop	2008-06-30 09:36:43 UTC (rev 7604)
@@ -2,7 +2,7 @@
 Name=Doom
 GenericName=Doom
 Comment=First Person Shooter Game
-Exec=doom -iwad /usr/share/games/doom-package/doom.wad
+Exec=doom -iwad /usr/share/games/game-package/doom.wad
 Icon=doom.xpm
 Terminal=false
 Type=Application

Modified: packages/branches/game-package/support_quake3/doom-wad/usr/share/pixmaps/doom.xpm
===================================================================
--- packages/branches/game-package/support_quake3/doom-wad/usr/share/pixmaps/doom.xpm	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom-wad/usr/share/pixmaps/doom.xpm	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,342 +0,0 @@
-/* XPM */
-/*
-	based on the Doom Wikia logo by Fredrik Johansson
-	<http://doom.wikia.com/wiki/Image:Wikilogo.png>
-	Separate GPL licence granted:
-	<http://doom.wikia.com/index.php?title=User_talk:Fredrik&oldid=38426#wiki_logo_.2F_cute_caco_copyright>
-*/
-static char *Wiki[] = {
-/* columns rows colors chars-per-pixel */
-"62 73 257 2",
-"   c #010000",
-".  c #0B0200",
-"X  c #08090A",
-"o  c #070215",
-"O  c #061517",
-"+  c #140D06",
-"@  c #160603",
-"#  c #110418",
-"$  c #161610",
-"%  c #130022",
-"&  c #160729",
-"*  c #161528",
-"=  c #130E2D",
-"-  c #0F2328",
-";  c #270902",
-":  c #360803",
-">  c #381405",
-",  c #2A160F",
-"<  c #26073A",
-"1  c #251738",
-"2  c #2A172A",
-"3  c #352510",
-"4  c #373639",
-"5  c #2B2930",
-"6  c #192A4E",
-"7  c #2A1648",
-"8  c #300E4D",
-"9  c #3A1963",
-"0  c #3B0E68",
-"q  c #292448",
-"w  c #2A3747",
-"e  c #23365A",
-"r  c #352655",
-"t  c #36304C",
-"y  c #283D63",
-"u  c #333470",
-"i  c #1B1B41",
-"p  c #3A4222",
-"a  c #34444C",
-"s  c #2C4268",
-"d  c #31476D",
-"f  c #344B74",
-"g  c #395379",
-"h  c #2F4672",
-"j  c #4C0100",
-"k  c #460803",
-"l  c #461501",
-"z  c #540000",
-"x  c #5A0000",
-"c  c #540B00",
-"v  c #591802",
-"b  c #4D1914",
-"n  c #492506",
-"m  c #4A3901",
-"M  c #592603",
-"N  c #593600",
-"B  c #4D2C15",
-"V  c #4E2F2B",
-"C  c #630100",
-"Z  c #6C0000",
-"A  c #670900",
-"S  c #681600",
-"D  c #730100",
-"F  c #7A0100",
-"G  c #780900",
-"H  c #781600",
-"J  c #6C2400",
-"K  c #642402",
-"L  c #673800",
-"P  c #772401",
-"I  c #7A3600",
-"U  c #6D2A17",
-"Y  c #693734",
-"T  c #70342A",
-"R  c #401E3A",
-"E  c #441A69",
-"W  c #463351",
-"Q  c #422767",
-"!  c #4B2B76",
-"~  c #4B3877",
-"^  c #4D366A",
-"/  c #54255D",
-"(  c #4F4F06",
-")  c #564733",
-"_  c #714B04",
-"`  c #6C472F",
-"'  c #6E7402",
-"]  c #566B0E",
-"[  c #4A4644",
-"{  c #524F53",
-"}  c #484876",
-"|  c #465877",
-" . c #514F6E",
-".. c #516354",
-"X. c #516B75",
-"o. c #6F5250",
-"O. c #665168",
-"+. c #706D6D",
-"@. c #6D6257",
-"#. c #365186",
-"$. c #375BA7",
-"%. c #3C65A7",
-"&. c #513B83",
-"*. c #455A89",
-"=. c #584787",
-"-. c #57588C",
-";. c #514E8F",
-":. c #48668A",
-">. c #54688C",
-",. c #5B7986",
-"<. c #4E6A96",
-"1. c #605597",
-"2. c #6455A4",
-"3. c #614EA0",
-"4. c #68738E",
-"5. c #6A63AB",
-"6. c #716BB8",
-"7. c #4465A4",
-"8. c #716EC3",
-"9. c #203986",
-"0. c #6D8D00",
-"q. c #7CA800",
-"w. c #6BB400",
-"e. c #69C300",
-"r. c #62828E",
-"t. c #5E818C",
-"y. c #830100",
-"u. c #8A0200",
-"i. c #860C00",
-"p. c #871700",
-"a. c #920300",
-"s. c #990800",
-"d. c #961700",
-"f. c #911512",
-"g. c #8C2200",
-"h. c #862802",
-"j. c #873801",
-"k. c #932300",
-"l. c #992801",
-"z. c #963504",
-"x. c #943016",
-"c. c #903324",
-"v. c #A80600",
-"b. c #AB1B00",
-"n. c #A41700",
-"m. c #B70600",
-"M. c #B61700",
-"N. c #A32300",
-"B. c #AC2400",
-"V. c #A72B01",
-"C. c #A83604",
-"Z. c #B62701",
-"A. c #B83603",
-"S. c #AC3215",
-"D. c #A63724",
-"F. c #854400",
-"G. c #895600",
-"H. c #984500",
-"J. c #955900",
-"K. c #8E4411",
-"L. c #924F2F",
-"P. c #9B6502",
-"I. c #A64702",
-"U. c #A85200",
-"Y. c #B84506",
-"T. c #B95501",
-"R. c #B94A19",
-"E. c #B1492C",
-"W. c #A76A01",
-"Q. c #B47201",
-"!. c #927D39",
-"~. c #896257",
-"^. c #8C7370",
-"/. c #B95142",
-"(. c #975D56",
-"). c #C50700",
-"_. c #C51600",
-"`. c #D41300",
-"'. c #C62700",
-"]. c #C73803",
-"[. c #D52800",
-"{. c #D73802",
-"}. c #C63413",
-"|. c #E13302",
-" X c #D03728",
-".X c #C94605",
-"XX c #C75602",
-"oX c #D54604",
-"OX c #D54717",
-"+X c #D65403",
-"@X c #CA4F16",
-"#X c #D1502B",
-"$X c #D16B02",
-"%X c #E64805",
-"&X c #E85309",
-"*X c #EF5212",
-"=X c #E95425",
-"-X c #EA532D",
-";X c #ED6B00",
-":X c #E76502",
-">X c #EA7302",
-",X c #F36A04",
-"<X c #F96614",
-"1X c #F47200",
-"2X c #F97800",
-"3X c #F97316",
-"4X c #F56A30",
-"5X c #D56329",
-"6X c #D15846",
-"7X c #D8654F",
-"8X c #FB7747",
-"9X c #FA7553",
-"0X c #EF6A4D",
-"qX c #FA7A63",
-"wX c #E85A46",
-"eX c #8E7B8F",
-"rX c #8CAC01",
-"tX c #BB8C16",
-"yX c #8C827A",
-"uX c #AD8777",
-"iX c #8DCA00",
-"pX c #A7CF00",
-"aX c #A9ED00",
-"sX c #D48A01",
-"dX c #F78A00",
-"fX c #EF9007",
-"gX c #FEA500",
-"hX c #FF8151",
-"jX c #868585",
-"kX c #93918F",
-"lX c #AD918D",
-"zX c #AFACAC",
-"xX c #A0A1A3",
-"cX c #A19DCE",
-"vX c #CE9995",
-"bX c #D3A298",
-"nX c #D8A7A5",
-"mX c #D6B5B4",
-"MX c #CAB2B0",
-"NX c #EA9593",
-"BX c #EFA19E",
-"VX c #E5A8A6",
-"CX c #F2B4B2",
-"ZX c #DDC2BD",
-"AX c #CFCDCC",
-"SX c #DDE3E6",
-"DX c #F7CAC8",
-"FX c #FCD8D6",
-"GX c #EAD1CF",
-"HX c #FBE0D9",
-"JX c #E6E7E7",
-"KX c #FBE8E6",
-"LX c #FBFCFB",
-"PX c #F5F4F4",
-"IX c #F2F1F1",
-"UX c #BFBED7",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXYXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX+.LXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXJXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXkXLXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXkXLXLXSXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXIXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXLXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXJXSXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXPXLXSXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXIXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXjXPXLXLXLXxXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXSXIXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXPXLXPXLXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXSXLXAXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXJXLXLXLXLXzXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXIXLXUXUXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX^.SXPXLXLXLXLX{ YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXSXLXIXAXzXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX^.mXJXPXLXPXLXAXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXHXKXIXSXUXzXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX~.mXHXPXLXLXLXLX+.YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  YXlXFXFXGXCXMXxXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX at .mXAXIXPXLXPXLXJX# YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX^.DXDXFXGXVXVXkXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX at .MXmXJXPXPXLXPXPXMXYXYXYXYXYXYXYXYXYXj.v T Y ) ) Y b h.c j k : + O X @.SXKXFXGXJXnXnXyXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX{ mXMXZXJXPXLXPXLXLX~.YXYXYXYXV T c.f.Z.n.f.x.S.x.x.d.d.A j Z F G D x L.mXFXFXGXAXbXVX at .YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXMXmXMXSXIXLXPXLXLXGXo.: U G f.S.'.{.*XOXoX]. at X+X}.%X{.A.C.S d.d.b.s.D G /.MXDXmXMXNXo.YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXbXBXbXmXSXLXLXLXLXPXMXL.}.a.m.[.*X4X<X*X%XC.l.V.Y..X].{.oXV.z.H `.{.M.a.y.x./.vXZXzXY YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXvXNXbXMXSXPXLXPXLXFXKXvXD.a.v.`.|.fX3X<X*XB.d.l.].A.]..X.X.Xz.P H [.|.{.m.a.u.S.lXxXB YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXyXBXnXnXNXGXPXLXLXFXFXFXeXy.u.m.[.3X3X<X*XA.oX*X&X%X].A.A.%XY.I.h.x.A.].[.m.v.y.F U 5 YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYX at .mXNXNXvXVXJXPXIXFXGXCXCXb i.Z._.<X3X<X*XA.&X<X&X%X[._.V.l.z. at XI.M Y..XA.n.v.v.y.C > YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYX5 ZXNXNXMXBXCXGXFXHXFXCXFXo.D d.v.|.&X<X<X at X+X,X*X%X[.[.[.d.H A.k.S z.S.&X.XB.s.u.d.i.l YXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXn vXnXqXNXVXBXCXCXKXDXCXDXeXz p.u.[.%X%X*XT.+X<X&X%X%X{.|.Z.V.].A.A.Z.A.g.A.{.{.[.[.s.D uXLXMX( YXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXm ~.mXBXNXVXCXCXVXCXCXBXHXlXG N.s.b.{.V.C.V.}.&X{.%X%X%X|.oXY.oXXXoX{.A.k.A.'.].).m.m.u.D ZX4.YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXS B lXBXNXNXnXCXCXCXNXBXKX at .A n.y.d.OX&XY.H N.]..X{.A.A.z.I.Y.z.V.oX.XoXA.'.V.'.`._.).m.F P ` YXYXYXYXYX",
-"YX) YXYXYXYXYXYXYXYXH D V lXNXNXNXVXDXDXBXCXGX5 M.i.a.H z.C.B.n.].].oX]..XC.j.z.P H k..X.XoX.XA.l.C.{.`.`.).m.y.YXYXYXYXYXYX",
-"YX- @.YXYXYXYXYXYXd.d.y.F V lXVXNXBXmXGXCXvXw D V.i.d.n.c j d.d.B.+X&XA.j.J M l.A.Y.C.p.l.C.].I.I.C.Z.n.d.m.).s.G YXYXYXYXYX",
-"YXYX+.+.YXYXYXYXV.p.H v j j : o. at .~.{ ~.L.T F x x x G Z D N.Z.V..XA.Z.u.x A i.k.h.: k n k : : p.S z.p.M.d.d.u.m.F K YXYXYXYX",
-"YXYX4 kXyX~.L.j.B.v.G P l.c C x C C z G s.y.s.s.s.y.Z V.C.].B.b.A.A.b.v.u.p.H l.> m _ 0.] ] M : P l.g.b.d.l.B.F y.S YXYXYXYX",
-"YXYX$ kXxXxXzX+.> v.s.d.C.C.h.H f.b.n.b.b.M.m.[.S.S.OX*X&X{.{.{.{.%X'.).G h.G S ( 0.0.0.' q.w.l : H n.p.Y.A.A.B.a.y.> YXYXYX",
-"YXYXYXjXzXAXAXIXzXV v.m.m.n.d.K.Y.B.V.&X%X*X4X#Xx. at XR.v.).).).).).[.&Xm.i.d.G _ 0.0.( , $ 0.iX] > ; u.p. at XC.A.A.'.s.k YXYXYX",
-"YXYXYX[ zXUXSXIXLXGX^.u.m.v.s.oX3X<X4X3X<X5X#X#X5Xz.A.l.d.s.M._._.).{.&Xy.D A ' e.0.o   ; # iX' ( A F M..XA. at X#XOXb.y.YXYXYX",
-"YXYXYX5 zXMXAXSXIXHXFXeXp.v.a.[.<X3XfX>X at X5XE.5X8XwX4X@XA.k.p.l.V.A.b.OXi.Z A 0.e.0.o + , o e.rX0.Z u.M.}.OX+X.X}.d.a.YXYXYX",
-"YXYXYXYX+.VXNXmXSXGXDXDX^.C y.G %X3X>X at X$X0X0X5XhXqXhX4X=X-X#Xz.z.C.n.A.d.x v ' w.q.o @ ; # q.q.rXC F Z.#X4X4X&X=X_.a.k YXYX",
-"YXYXYXYXV MXnXbXmXmXGXCXZX) a.s.N.4X5X:X4XqX7X7X9X7X4X4X9XqX4X0Xc.D.-X|.d.Z G _ pXpX0., , $ aXw.rXy.y.}.4X4X8X*X-X Xa.x YXYX",
-"YXYXYXYX3 eXMXVXnXnXVXBXGXX.u.m.k.I z.x.6X0X#X5X5X7X8X4X9X0X8XqXwX7X6XZ._.u.D L q.aXaXpXq.iXiXrX0.y.v.4X9X9X9X%X-X6Xd.l.YXYX",
-"YXYXYXYXD b lXVXnXnXVXBXCX..y.).B.h.S H  XOXR.Y.C.7X9X9X7XwX9X9X9X0X0X#XOX_.a.F M rXaXpXiXrX0.iXF.y.}.hX8X8X-X=X-XwXl.l.YXYX",
-"YXYXYXYXC C Y lXvXmXmXAXO.v u.%X+Xz.k c c.> @ M l.E.E.0XqX9XqX-X9XhXqXwX-X-X-XD.F b ' rXpXiXq.( i.a.-XhX4X4X6X#X6X/.[.F YXYX",
-"YXYXYXYXZ Z F T lXmXMX4 > N.&X{.<X.Xp.S # 7 < * T c.x.x.c.7X7X5XhX8X0X0XwX0XwX XS.y.f.x.j.N I F S.-X9X#X6XL.D.U c.x m.D YXYX",
-"YXYXYX$ y.Z x j k k b Z d.'.[.*XoXz.g., 1 & o o { (.P H x.#XE.E.6X7X7X5X0X-XV.0X-XS.M.n.u.v.l.k.D.6X6XD./.T Y $ O.4 l y.: YX",
-"YXYXYX; F j x z z D Z d.A.%X*X*Xz.h.p., & o o o +.mXxX# l U E.p.l.=X7X7X6XwXR.wX-X#X[. at Xl.l.x.h./././.U V 4 o 5 FX+.O c k YX",
-"YXYXYX: G j z A j G y.A.oX%X*X%X{.A.d.2 & # o # { GXmXo o 1 3 T V V b /.7X#X#X-X#XS.qX6XS.x.S.E.E.E.U ^.xX+.% * vXO.7 ; k YX",
-"YXYXYX: D x p.P H b.Y.,X*X*X%X%X%X].p.$ 7 o # % Q MXuX# o & = mXKXkX- * jX4.t 4 o.^.o.2 Y o.Y (.Y q ^.HXKX+.% & { t = @ k YX",
-"YXYXYXYXD y.g.j G A.&X<X3X*X%X%X*XOX}.V < % % & / lX4 # o o < lXFX+.r o - MXHXPXjXeXW t ~.VXVX(.r 7  .KXGX .& 1 [ 1 & @ k YX",
-"YXYXYXYXD a.s.y.d.l.+XOX<X<X%X|.{.[.S.T R # % 8 8 @.5 & o & < ^.DXO.r % * eXHXLX+.1 * = W DXFX4 = = 4 KXGX{ 8 < r * % + k YX",
-"YXYXYXYXF d.a.v.b.d.C..XoX&Xb.v.oXl.x x.R % # 8 < V & # < < 8 ..kXq q 1 7 ^.DXLXxX1 = = t vXMXi o q 5 HXZX{ 8 # 8 % # $ YXYX",
-"YXYXYXYXD u.B.s.d.Z.'.A.l.i.B.+Xb.M.V.S.T < # 0 8 9 < < 8 7 8 { o.1 q q ;.zXDXZXt t * 6 ^ yX^.r o 1 q ^.mX/ E < < # < 2 YXYX",
-"YXYXYXYXA a.u.B.b.i.p.A g.d.+X[.v.a.Z.Y.T R < < 8 8 9 / Q r 7 ^ $ r r u cXeXVXlX7 5 r u f ^.o.=.r t r [ xXQ E 4 4 & < $ YXYX",
-"YXYXYXYXz u.a.D k.N.s.A C A.%X_.m.v.m.l.x.T / 8 < 9 r +.W 8 & Q r =.3.cXeX^ bX^.;.h =.UX2.W u 2.=.u t 5 ..W 0 { +.% 8 + YXYX",
-"YXYXYXYXj a.F D l.n.v.i.C '.'.'._.).).s.Y.E.L./ < 7 t AX^ 9 < 1 ~ =.1.eX5.1.vX~.6.7.f eXUX2.1.2.3.~ r q 5 Q u +.zX8 r ; YXYX",
-"YXYXYXYX; y.Z l.d.a.d.p.A C.oX{.{.).).=X%XOXL./ ^ $ zXAX{ 9 1 1 ~ 1.2.2.2.3.{ W 8.6.;.=.8.6.5.3.2.} t < Q Q 9 kXLX .$ j YXYX",
-"YXYXYXYXYXC F l.u.y.u.b.B.Y.oXoXoX_.m.}.=XN.C.c./ O.DXDX{ 9 r r ^ } =.2.5.6.W 1.6.8.;.;.6.6.5.3.=.^ y 1 Q E R bXPXX.: : YXYX",
-"YXYXYXYXYXz l.A u.i.y.d.A.C.oX{.'._.).).=X}..Xc.U ^.HXAX{ 9 r ^ } [  .2.5.6.2.2.5.5.1.;.5.2.2.3. .{ ^ 8 Q Q 2 nXGX[ D YXYXYX",
-"YXYXYXYXYX: G D G p.F n.C.S l.%X{.'.).).[.-XOXS.P V kXAXW 9 7 &.W 4.[ 3.2.2.2.2.2.;.2.2.2.2.2.=.O.r.{ ! ^ Q = lX` P y.YXYXYX",
-"YXYXYXYXYXYXZ F C p.F B.p.S k.oXoX]._.).M.A.R.#X%XS > { r ! ~ ! { AX{ =.=.=.3.2. .4 =.=.=.=.1.=. at .PX+.! ~ ^ q B S M.k YXYXYX",
-"YXYXYXYXYXYX> y.Z G G d.p.H g.Z.Z.'.{.N.N.b.OX4X<X{.k.> R Q ! Q @.DX{ &.=.=.=.=.} ..^ =.} &.=.~ ^.LX+.^ ~ ~ V l.#Xd.YXYXYXYX",
-"YXYXYXYXYXYXO F D C l.i.g.p.p.G Z.].B.V.B.{.%X*X4X=X*XP K 5 9 u eXFXo.! ! ~ ~ ! O.lX{ ! ! ! ! ^ uXKXkXu u V x.A.S.A YXYXYXYX",
-"YXYXYXYXYXYXYX; u.Z D g.d.d.H C G d.p.d.'.Z.M.|.|.-X=X_.g.P 3 Y 7XCX+.&.! ! ! Q @.FX[ ! Q / E Q lXPXzX1 v l.OX[.y.: YXYXYXYX",
-"YXYXYXYXYXYXYXYXj y.F h.l.Z y.x j x n.M.'.M.M.m.'.*X=X=X at XA.S c ` ` { W Q Q E Q yXPX+.0 E 0 9 W +.~.3 K .X#X4Xd.z YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXD y.D G Z D Z j z Z G b.v.m.m.m._.{.#X=XOXk.S D.B M Y 7 8 9 W jXmXjXt 0 E E W T K.S z. at X=XOXd.YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX; y.F Z x x Z C C C C G y.v.v.v.s.M.'.}.=X+Xk.S.D.D.S.U U Y 5 ) ` o.) V Y L.F.C.oXS.z.-XOXZ.c YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYX; u.D Z z z C D Z F F Z y.u.v.M.v.s.Z.N.C.Z.%XY.C.4X5X#XR.D.R.XXY.XX.X at X=X=X4X=X#Xl.[.Z.H YXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXX j F Z D z z C C i.d.D C Z p.Z.Z.Z.a.n.C.'.].{.oX:X%X<X4X at X X=X=X|.=X=X*X4X-X#XoX{.b.d.YXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXk D Z Z x x G k.Z D Z Z p.p.b.n.A d.d.Z.n.M.'.M.b.].oXA.A.-X#X#XOX}.].A.x.h.Z.].F YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYX: F D Z Z G F Z C Z Z H H d.S C l.a.D y.a.s.'.'.'.oXp.].*XoXOXA.p.k.H C D ].i.YXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYX+ y.F Z Z Z Z x C Z F D H j C u.F F F y.F u.u.s.n.G .XC.g.k.p.H H H F F u.YXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX3 x D D Z Z Z x z A G d.x C C Z F D F F D D D D G N.C C C Z D F F F D YXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXn l z F Z x Z Z x C D z z z x Z D D Z Z Z D C k.F F F y.y.u.y.Z k YXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX> : z D D Z Z Z Z D C x z C C D D F D D D i.D F F F y.F c YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX; j y.F F x x C D z C Z Z D Z Z Z Z C D D y.F k > M YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX: z z z z Z D D C C C C C C j C b 3 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX: : : > : l b k b b : l 1 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
-};

Modified: packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/control
===================================================================
--- packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/control	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/control	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,13 +0,0 @@
-Package: doom2-wad
-Version: 7
-Section: non-free/games
-Priority: optional
-Architecture: all
-Recommends: doom-engine
-Provides: doom-wad
-Installed-Size: 56
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Description: IWAD from ID Software's DOOM 2 computer game
- Doom requires both a doom-engine and a doom-wad to play. This package
- contains the IWAD from ID Software's game "DOOM 2", and was
- generated using the "game-package" program.

Modified: packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/postinst
===================================================================
--- packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/postinst	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom2-wad/DEBIAN/postinst	2008-06-30 09:36:43 UTC (rev 7604)
@@ -17,7 +17,7 @@
 			/usr/share/games/doom/doom2.wad      \
 			doom2.wad                            \
 			/usr/share/games/game-package/doom2.wad \
-			25
+			50
 	;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)

Modified: packages/branches/game-package/support_quake3/doom2-wad/usr/share/pixmaps/doom2.xpm
===================================================================
--- packages/branches/game-package/support_quake3/doom2-wad/usr/share/pixmaps/doom2.xpm	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/doom2-wad/usr/share/pixmaps/doom2.xpm	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,342 +0,0 @@
-/* XPM */
-/*
-	based on the Doom Wikia logo by Fredrik Johansson
-	<http://doom.wikia.com/wiki/Image:Wikilogo.png>
-	Separate GPL licence granted:
-	<http://doom.wikia.com/index.php?title=User_talk:Fredrik&oldid=38426#wiki_logo_.2F_cute_caco_copyright>
-*/
-static char *Wiki[] = {
-/* columns rows colors chars-per-pixel */
-"62 73 257 2",
-"   c #010000",
-".  c #0B0200",
-"X  c #08090A",
-"o  c #070215",
-"O  c #061517",
-"+  c #140D06",
-"@  c #160603",
-"#  c #110418",
-"$  c #161610",
-"%  c #130022",
-"&  c #160729",
-"*  c #161528",
-"=  c #130E2D",
-"-  c #0F2328",
-";  c #270902",
-":  c #360803",
-">  c #381405",
-",  c #2A160F",
-"<  c #26073A",
-"1  c #251738",
-"2  c #2A172A",
-"3  c #352510",
-"4  c #373639",
-"5  c #2B2930",
-"6  c #192A4E",
-"7  c #2A1648",
-"8  c #300E4D",
-"9  c #3A1963",
-"0  c #3B0E68",
-"q  c #292448",
-"w  c #2A3747",
-"e  c #23365A",
-"r  c #352655",
-"t  c #36304C",
-"y  c #283D63",
-"u  c #333470",
-"i  c #1B1B41",
-"p  c #3A4222",
-"a  c #34444C",
-"s  c #2C4268",
-"d  c #31476D",
-"f  c #344B74",
-"g  c #395379",
-"h  c #2F4672",
-"j  c #4C0100",
-"k  c #460803",
-"l  c #461501",
-"z  c #540000",
-"x  c #5A0000",
-"c  c #540B00",
-"v  c #591802",
-"b  c #4D1914",
-"n  c #492506",
-"m  c #4A3901",
-"M  c #592603",
-"N  c #593600",
-"B  c #4D2C15",
-"V  c #4E2F2B",
-"C  c #630100",
-"Z  c #6C0000",
-"A  c #670900",
-"S  c #681600",
-"D  c #730100",
-"F  c #7A0100",
-"G  c #780900",
-"H  c #781600",
-"J  c #6C2400",
-"K  c #642402",
-"L  c #673800",
-"P  c #772401",
-"I  c #7A3600",
-"U  c #6D2A17",
-"Y  c #693734",
-"T  c #70342A",
-"R  c #401E3A",
-"E  c #441A69",
-"W  c #463351",
-"Q  c #422767",
-"!  c #4B2B76",
-"~  c #4B3877",
-"^  c #4D366A",
-"/  c #54255D",
-"(  c #4F4F06",
-")  c #564733",
-"_  c #714B04",
-"`  c #6C472F",
-"'  c #6E7402",
-"]  c #566B0E",
-"[  c #4A4644",
-"{  c #524F53",
-"}  c #484876",
-"|  c #465877",
-" . c #514F6E",
-".. c #516354",
-"X. c #516B75",
-"o. c #6F5250",
-"O. c #665168",
-"+. c #706D6D",
-"@. c #6D6257",
-"#. c #365186",
-"$. c #375BA7",
-"%. c #3C65A7",
-"&. c #513B83",
-"*. c #455A89",
-"=. c #584787",
-"-. c #57588C",
-";. c #514E8F",
-":. c #48668A",
-">. c #54688C",
-",. c #5B7986",
-"<. c #4E6A96",
-"1. c #605597",
-"2. c #6455A4",
-"3. c #614EA0",
-"4. c #68738E",
-"5. c #6A63AB",
-"6. c #716BB8",
-"7. c #4465A4",
-"8. c #716EC3",
-"9. c #203986",
-"0. c #6D8D00",
-"q. c #7CA800",
-"w. c #6BB400",
-"e. c #69C300",
-"r. c #62828E",
-"t. c #5E818C",
-"y. c #830100",
-"u. c #8A0200",
-"i. c #860C00",
-"p. c #871700",
-"a. c #920300",
-"s. c #990800",
-"d. c #961700",
-"f. c #911512",
-"g. c #8C2200",
-"h. c #862802",
-"j. c #873801",
-"k. c #932300",
-"l. c #992801",
-"z. c #963504",
-"x. c #943016",
-"c. c #903324",
-"v. c #A80600",
-"b. c #AB1B00",
-"n. c #A41700",
-"m. c #B70600",
-"M. c #B61700",
-"N. c #A32300",
-"B. c #AC2400",
-"V. c #A72B01",
-"C. c #A83604",
-"Z. c #B62701",
-"A. c #B83603",
-"S. c #AC3215",
-"D. c #A63724",
-"F. c #854400",
-"G. c #895600",
-"H. c #984500",
-"J. c #955900",
-"K. c #8E4411",
-"L. c #924F2F",
-"P. c #9B6502",
-"I. c #A64702",
-"U. c #A85200",
-"Y. c #B84506",
-"T. c #B95501",
-"R. c #B94A19",
-"E. c #B1492C",
-"W. c #A76A01",
-"Q. c #B47201",
-"!. c #927D39",
-"~. c #896257",
-"^. c #8C7370",
-"/. c #B95142",
-"(. c #975D56",
-"). c #C50700",
-"_. c #C51600",
-"`. c #D41300",
-"'. c #C62700",
-"]. c #C73803",
-"[. c #D52800",
-"{. c #D73802",
-"}. c #C63413",
-"|. c #E13302",
-" X c #D03728",
-".X c #C94605",
-"XX c #C75602",
-"oX c #D54604",
-"OX c #D54717",
-"+X c #D65403",
-"@X c #CA4F16",
-"#X c #D1502B",
-"$X c #D16B02",
-"%X c #E64805",
-"&X c #E85309",
-"*X c #EF5212",
-"=X c #E95425",
-"-X c #EA532D",
-";X c #ED6B00",
-":X c #E76502",
-">X c #EA7302",
-",X c #F36A04",
-"<X c #F96614",
-"1X c #F47200",
-"2X c #F97800",
-"3X c #F97316",
-"4X c #F56A30",
-"5X c #D56329",
-"6X c #D15846",
-"7X c #D8654F",
-"8X c #FB7747",
-"9X c #FA7553",
-"0X c #EF6A4D",
-"qX c #FA7A63",
-"wX c #E85A46",
-"eX c #8E7B8F",
-"rX c #8CAC01",
-"tX c #BB8C16",
-"yX c #8C827A",
-"uX c #AD8777",
-"iX c #8DCA00",
-"pX c #A7CF00",
-"aX c #A9ED00",
-"sX c #D48A01",
-"dX c #F78A00",
-"fX c #EF9007",
-"gX c #FEA500",
-"hX c #FF8151",
-"jX c #868585",
-"kX c #93918F",
-"lX c #AD918D",
-"zX c #AFACAC",
-"xX c #A0A1A3",
-"cX c #A19DCE",
-"vX c #CE9995",
-"bX c #D3A298",
-"nX c #D8A7A5",
-"mX c #D6B5B4",
-"MX c #CAB2B0",
-"NX c #EA9593",
-"BX c #EFA19E",
-"VX c #E5A8A6",
-"CX c #F2B4B2",
-"ZX c #DDC2BD",
-"AX c #CFCDCC",
-"SX c #DDE3E6",
-"DX c #F7CAC8",
-"FX c #FCD8D6",
-"GX c #EAD1CF",
-"HX c #FBE0D9",
-"JX c #E6E7E7",
-"KX c #FBE8E6",
-"LX c #FBFCFB",
-"PX c #F5F4F4",
-"IX c #F2F1F1",
-"UX c #BFBED7",
-"YX c None",
-/* pixels */
-"YXYXYXYXYXYXYXYXYXYXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX+.LXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXJXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXkXLXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXkXLXLXSXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXIXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXLXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXJXSXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXLXPXLXSXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXIXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXjXPXLXLXLXxXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXSXIXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXPXLXPXLXLXjXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXSXLXAXAXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXyXJXLXLXLXLXzXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXIXLXUXUXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX^.SXPXLXLXLXLX{ YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXSXLXIXAXzXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX^.mXJXPXLXPXLXAXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXHXKXIXSXUXzXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX~.mXHXPXLXLXLXLX+.YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  YXlXFXFXGXCXMXxXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX at .mXAXIXPXLXPXLXJX# YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX^.DXDXFXGXVXVXkXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX at .MXmXJXPXPXLXPXPXMXYXYXYXYXYXYXYXYXYXj.v T Y ) ) Y b h.c j k : + O X @.SXKXFXGXJXnXnXyXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX{ mXMXZXJXPXLXPXLXLX~.YXYXYXYXV T c.f.Z.n.f.x.S.x.x.d.d.A j Z F G D x L.mXFXFXGXAXbXVX at .YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXMXmXMXSXIXLXPXLXLXGXo.: U G f.S.'.{.*XOXoX]. at X+X}.%X{.A.C.S d.d.b.s.D G /.MXDXmXMXNXo.YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXbXBXbXmXSXLXLXLXLXPXMXL.}.a.m.[.*X4X<X*X%XC.l.V.Y..X].{.oXV.z.H `.{.M.a.y.x./.vXZXzXY YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXvXNXbXMXSXPXLXPXLXFXKXvXD.a.v.`.|.fX3X<X*XB.d.l.].A.]..X.X.Xz.P H [.|.{.m.a.u.S.lXxXB YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXyXBXnXnXNXGXPXLXLXFXFXFXeXy.u.m.[.3X3X<X*XA.oX*X&X%X].A.A.%XY.I.h.x.A.].[.m.v.y.F U 5 YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYX at .mXNXNXvXVXJXPXIXFXGXCXCXb i.Z._.<X3X<X*XA.&X<X&X%X[._.V.l.z. at XI.M Y..XA.n.v.v.y.C > YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYX5 ZXNXNXMXBXCXGXFXHXFXCXFXo.D d.v.|.&X<X<X at X+X,X*X%X[.[.[.d.H A.k.S z.S.&X.XB.s.u.d.i.l YXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXn vXnXqXNXVXBXCXCXKXDXCXDXeXz p.u.[.%X%X*XT.+X<X&X%X%X{.|.Z.V.].A.A.Z.A.g.A.{.{.[.[.s.D uXLXMX( YXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXm ~.mXBXNXVXCXCXVXCXCXBXHXlXG N.s.b.{.V.C.V.}.&X{.%X%X%X|.oXY.oXXXoX{.A.k.A.'.].).m.m.u.D ZX4.YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXS B lXBXNXNXnXCXCXCXNXBXKX at .A n.y.d.OX&XY.H N.]..X{.A.A.z.I.Y.z.V.oX.XoXA.'.V.'.`._.).m.F P ` YXYXYXYXYX",
-"YX) YXYXYXYXYXYXYXYXH D V lXNXNXNXVXDXDXBXCXGX5 M.i.a.H z.C.B.n.].].oX]..XC.j.z.P H k..X.XoX.XA.l.C.{.`.`.).m.y.YXYXYXYXYXYX",
-"YX- @.YXYXYXYXYXYXd.d.y.F V lXVXNXBXmXGXCXvXw D V.i.d.n.c j d.d.B.+X&XA.j.J M l.A.Y.C.p.l.C.].I.I.C.Z.n.d.m.).s.G YXYXYXYXYX",
-"YXYX+.+.YXYXYXYXV.p.H v j j : o. at .~.{ ~.L.T F x x x G Z D N.Z.V..XA.Z.u.x A i.k.h.: k n k : : p.S z.p.M.d.d.u.m.F K YXYXYXYX",
-"YXYX4 kXyX~.L.j.B.v.G P l.c C x C C z G s.y.s.s.s.y.Z V.C.].B.b.A.A.b.v.u.p.H l.> m _ 0.] ] M : P l.g.b.d.l.B.F y.S YXYXYXYX",
-"YXYX$ kXxXxXzX+.> v.s.d.C.C.h.H f.b.n.b.b.M.m.[.S.S.OX*X&X{.{.{.{.%X'.).G h.G S ( 0.0.0.' q.w.l : H n.p.Y.A.A.B.a.y.> YXYXYX",
-"YXYXYXjXzXAXAXIXzXV v.m.m.n.d.K.Y.B.V.&X%X*X4X#Xx. at XR.v.).).).).).[.&Xm.i.d.G _ 0.0.( , $ 0.iX] > ; u.p. at XC.A.A.'.s.k YXYXYX",
-"YXYXYX[ zXUXSXIXLXGX^.u.m.v.s.oX3X<X4X3X<X5X#X#X5Xz.A.l.d.s.M._._.).{.&Xy.D A ' e.0.o   ; # iX' ( A F M..XA. at X#XOXb.y.YXYXYX",
-"YXYXYX5 zXMXAXSXIXHXFXeXp.v.a.[.<X3XfX>X at X5XE.5X8XwX4X@XA.k.p.l.V.A.b.OXi.Z A 0.e.0.o + , o e.rX0.Z u.M.}.OX+X.X}.d.a.YXYXYX",
-"YXYXYXYX+.VXNXmXSXGXDXDX^.C y.G %X3X>X at X$X0X0X5XhXqXhX4X=X-X#Xz.z.C.n.A.d.x v ' w.q.o @ ; # q.q.rXC F Z.#X4X4X&X=X_.a.k YXYX",
-"YXYXYXYXV MXnXbXmXmXGXCXZX) a.s.N.4X5X:X4XqX7X7X9X7X4X4X9XqX4X0Xc.D.-X|.d.Z G _ pXpX0., , $ aXw.rXy.y.}.4X4X8X*X-X Xa.x YXYX",
-"YXYXYXYX3 eXMXVXnXnXVXBXGXX.u.m.k.I z.x.6X0X#X5X5X7X8X4X9X0X8XqXwX7X6XZ._.u.D L q.aXaXpXq.iXiXrX0.y.v.4X9X9X9X%X-X6Xd.l.YXYX",
-"YXYXYXYXD b lXVXnXnXVXBXCX..y.).B.h.S H  XOXR.Y.C.7X9X9X7XwX9X9X9X0X0X#XOX_.a.F M rXaXpXiXrX0.iXF.y.}.hX8X8X-X=X-XwXl.l.YXYX",
-"YXYXYXYXC C Y lXvXmXmXAXO.v u.%X+Xz.k c c.> @ M l.E.E.0XqX9XqX-X9XhXqXwX-X-X-XD.F b ' rXpXiXq.( i.a.-XhX4X4X6X#X6X/.[.F YXYX",
-"YXYXYXYXZ Z F T lXmXMX4 > N.&X{.<X.Xp.S # 7 < * T c.x.x.c.7X7X5XhX8X0X0XwX0XwX XS.y.f.x.j.N I F S.-X9X#X6XL.D.U c.x m.D YXYX",
-"YXYXYX$ y.Z x j k k b Z d.'.[.*XoXz.g., 1 & o o { (.P H x.#XE.E.6X7X7X5X0X-XV.0X-XS.M.n.u.v.l.k.D.6X6XD./.T Y $ O.4 l y.: YX",
-"YXYXYX; F j x z z D Z d.A.%X*X*Xz.h.p., & o o o +.mXxX# l U E.p.l.=X7X7X6XwXR.wX-X#X[. at Xl.l.x.h./././.U V 4 o 5 FX+.O c k YX",
-"YXYXYX: G j z A j G y.A.oX%X*X%X{.A.d.2 & # o # { GXmXo o 1 3 T V V b /.7X#X#X-X#XS.qX6XS.x.S.E.E.E.U ^.xX+.% * vXO.7 ; k YX",
-"YXYXYX: D x p.P H b.Y.,X*X*X%X%X%X].p.$ 7 o # % Q MXuX# o & = mXKXkX- * jX4.t 4 o.^.o.2 Y o.Y (.Y q ^.HXKX+.% & { t = @ k YX",
-"YXYXYXYXD y.g.j G A.&X<X3X*X%X%X*XOX}.V < % % & / lX4 # o o < lXFX+.r o - MXHXPXjXeXW t ~.VXVX(.r 7  .KXGX .& 1 [ 1 & @ k YX",
-"YXYXYXYXD a.s.y.d.l.+XOX<X<X%X|.{.[.S.T R # % 8 8 @.5 & o & < ^.DXO.r % * eXHXLX+.1 * = W DXFX4 = = 4 KXGX{ 8 < r * % + k YX",
-"YXYXYXYXF d.a.v.b.d.C..XoX&Xb.v.oXl.x x.R % # 8 < V & # < < 8 ..kXq q 1 7 ^.DXLXxX1 = = t vXMXi o q 5 HXZX{ 8 # 8 % # $ YXYX",
-"YXYXYXYXD u.B.s.d.Z.'.A.l.i.B.+Xb.M.V.S.T < # 0 8 9 < < 8 7 8 { o.1 q q ;.zXDXZXt t * 6 ^ yX^.r o 1 q ^.mX/ E < < # < 2 YXYX",
-"YXYXYXYXA a.u.B.b.i.p.A g.d.+X[.v.a.Z.Y.T R < < 8 8 9 / Q r 7 ^ $ r r u cXeXVXlX7 5 r u f ^.o.=.r t r [ xXQ E 4 4 & < $ YXYX",
-"YXYXYXYXz u.a.D k.N.s.A C A.%X_.m.v.m.l.x.T / 8 < 9 r +.W 8 & Q r =.3.cXeX^ bX^.;.h =.UX2.W u 2.=.u t 5 ..W 0 { +.% 8 + YXYX",
-"YXYXYXYXj a.F D l.n.v.i.C '.'.'._.).).s.Y.E.L./ < 7 t AX^ 9 < 1 ~ =.1.eX5.1.vX~.6.7.f eXUX2.1.2.3.~ r q 5 Q u +.zX8 r ; YXYX",
-"YXYXYXYX; y.Z l.d.a.d.p.A C.oX{.{.).).=X%XOXL./ ^ $ zXAX{ 9 1 1 ~ 1.2.2.2.3.{ W 8.6.;.=.8.6.5.3.2.} t < Q Q 9 kXLX .$ j YXYX",
-"YXYXYXYXYXC F l.u.y.u.b.B.Y.oXoXoX_.m.}.=XN.C.c./ O.DXDX{ 9 r r ^ } =.2.5.6.W 1.6.8.;.;.6.6.5.3.=.^ y 1 Q E R bXPXX.: : YXYX",
-"YXYXYXYXYXz l.A u.i.y.d.A.C.oX{.'._.).).=X}..Xc.U ^.HXAX{ 9 r ^ } [  .2.5.6.2.2.5.5.1.;.5.2.2.3. .{ ^ 8 Q Q 2 nXGX[ D YXYXYX",
-"YXYXYXYXYX: G D G p.F n.C.S l.%X{.'.).).[.-XOXS.P V kXAXW 9 7 &.W 4.[ 3.2.2.2.2.2.;.2.2.2.2.2.=.O.r.{ ! ^ Q = lX` P y.YXYXYX",
-"YXYXYXYXYXYXZ F C p.F B.p.S k.oXoX]._.).M.A.R.#X%XS > { r ! ~ ! { AX{ =.=.=.3.2. .4 =.=.=.=.1.=. at .PX+.! ~ ^ q B S M.k YXYXYX",
-"YXYXYXYXYXYX> y.Z G G d.p.H g.Z.Z.'.{.N.N.b.OX4X<X{.k.> R Q ! Q @.DX{ &.=.=.=.=.} ..^ =.} &.=.~ ^.LX+.^ ~ ~ V l.#Xd.YXYXYXYX",
-"YXYXYXYXYXYXO F D C l.i.g.p.p.G Z.].B.V.B.{.%X*X4X=X*XP K 5 9 u eXFXo.! ! ~ ~ ! O.lX{ ! ! ! ! ^ uXKXkXu u V x.A.S.A YXYXYXYX",
-"YXYXYXYXYXYXYX; u.Z D g.d.d.H C G d.p.d.'.Z.M.|.|.-X=X_.g.P 3 Y 7XCX+.&.! ! ! Q @.FX[ ! Q / E Q lXPXzX1 v l.OX[.y.: YXYXYXYX",
-"YXYXYXYXYXYXYXYXj y.F h.l.Z y.x j x n.M.'.M.M.m.'.*X=X=X at XA.S c ` ` { W Q Q E Q yXPX+.0 E 0 9 W +.~.3 K .X#X4Xd.z YXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXD y.D G Z D Z j z Z G b.v.m.m.m._.{.#X=XOXk.S D.B M Y 7 8 9 W jXmXjXt 0 E E W T K.S z. at X=XOXd.YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYX; y.F Z x x Z C C C C G y.v.v.v.s.M.'.}.=X+Xk.S.D.D.S.U U Y 5 ) ` o.) V Y L.F.C.oXS.z.-XOXZ.c YXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYX; u.D Z z z C D Z F F Z y.u.v.M.v.s.Z.N.C.Z.%XY.C.4X5X#XR.D.R.XXY.XX.X at X=X=X4X=X#Xl.[.Z.H YXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXX j F Z D z z C C i.d.D C Z p.Z.Z.Z.a.n.C.'.].{.oX:X%X<X4X at X X=X=X|.=X=X*X4X-X#XoX{.b.d.YXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXk D Z Z x x G k.Z D Z Z p.p.b.n.A d.d.Z.n.M.'.M.b.].oXA.A.-X#X#XOX}.].A.x.h.Z.].F YXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYX: F D Z Z G F Z C Z Z H H d.S C l.a.D y.a.s.'.'.'.oXp.].*XoXOXA.p.k.H C D ].i.YXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYX+ y.F Z Z Z Z x C Z F D H j C u.F F F y.F u.u.s.n.G .XC.g.k.p.H H H F F u.YXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX3 x D D Z Z Z x z A G d.x C C Z F D F F D D D D G N.C C C Z D F F F D YXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXn l z F Z x Z Z x C D z z z x Z D D Z Z Z D C k.F F F y.y.u.y.Z k YXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX> : z D D Z Z Z Z D C x z C C D D F D D D i.D F F F y.F c YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX; j y.F F x x C D z C Z Z D Z Z Z Z C D D y.F k > M YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX: z z z z Z D D C C C C C C j C b 3 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX: : : > : l b k b b : l 1 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
-};

Modified: packages/branches/game-package/support_quake3/etc/game-package.conf
===================================================================
--- packages/branches/game-package/support_quake3/etc/game-package.conf	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/etc/game-package.conf	2008-06-30 09:36:43 UTC (rev 7604)
@@ -2,4 +2,4 @@
 # arguments accept "yes" or "no"
 
 INSTALL="yes"	# install the generated package on the local system
-PRESERVE="no"	# do not preserve the generated package file
+PRESERVE="no"	# do not preserve the generated package file(s)

Modified: packages/branches/game-package/support_quake3/game-package
===================================================================
--- packages/branches/game-package/support_quake3/game-package	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/game-package	2008-06-30 09:36:43 UTC (rev 7604)
@@ -19,7 +19,8 @@
 	printf "\tname\tdescription\n"
 	printf "\t----\t-----------\n"
 
-	find $SUPPORTED -type f | grep -v '\.svn' | grep -v 'swp$' | while read file; do
+	find $SUPPORTED -type f | grep -v '\.svn' | grep -v 'swp$' | sort |
+	while read file; do
 		. $file
 		printf "\t%s\t%s\n" "$SHORTNAME" "$LONGNAME"
 	done
@@ -28,8 +29,7 @@
 	echo "game-package arguments:"
 	echo "        -n            not do not install the generated package"\
 		"(implies -p)"
-	echo "        -f outfile    write the generated .deb to OUTFILE and"\
-		"do not delete it"
+	echo "        -d OUTDIR     write the generated .debs to OUTDIR"
 }
 
 usage() {
@@ -61,7 +61,7 @@
 else
 	source "/etc/game-package.conf"
 fi
-OUTFILE=""
+OUTDIR=""
 
 # process command line arguments
 while [ $# -gt 1 ]; do
@@ -70,15 +70,15 @@
 			INSTALL="no"
 			PRESERVE="yes"
 			;;
-		'-f')
+		'-d')
 			PRESERVE="yes"
 			shift
 			if [ $# -lt 2 ]; then
-				echo "missing filename or game argument" >&2
+				echo "missing directory or game argument" >&2
 				usage >&2
 				exit 1
 			fi
-			OUTFILE="$1"
+			OUTDIR="$1"
 			;;
 		'--')
 			break;
@@ -95,7 +95,7 @@
 
 GAME="$1"
 if [ ! -f "$SUPPORTED/$GAME" ]; then
-	echo "unknown game '$GAME'" >&2
+	echo "unknown option or game '$GAME'" >&2
 	supported >&2
 	exit 1
 fi
@@ -104,14 +104,22 @@
 debug "short: $SHORTNAME"
 debug "long: $LONGNAME"
 
+# setup a working directory
+WORKDIR=`mktemp -t -d game-package.XXXXXX`
+debug "WORKDIR=$WORKDIR"
+
 # now the game's handler needs to be executed
 shift
 go $*
 
+# TODO: OUTFILE not referenced before here in this file; we're
+# assuming "go" will have defined it.
 if [ "$INSTALL" = "yes" ]; then
 	install_deb "$OUTFILE"
 fi
 
+# cleanup
 if [ "$PRESERVE" != "yes" ]; then
 	rm "$OUTFILE"
 fi
+rmdir "$WORKDIR"

Modified: packages/branches/game-package/support_quake3/lib/game-package-shared
===================================================================
--- packages/branches/game-package/support_quake3/lib/game-package-shared	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/lib/game-package-shared	2008-06-30 09:36:43 UTC (rev 7604)
@@ -41,8 +41,6 @@
 	RELPATH="$2" # relative path in the unpacked .deb
 	shift 2
 
-	WORKDIR=`mktemp -td game-package-shared.slipstream.XXXXXX`
-	debug "WORKDIR=$WORKDIR"
 	OLDWD=`pwd`
 	cd "$WORKDIR"
 
@@ -59,7 +57,6 @@
 	slipstream_cleanup
 
 	cd "$OLDWD"
-	# rmdir $WORKDIR
 }
 
 slipstream_permcheck() {
@@ -79,7 +76,7 @@
 slipstream_unpack() {
 	DEB="$1"
 	dpkg-deb -e "$DEB" "./DEBIAN"
-	dpkg-deb -x "$DEB" "./foo"
+	dpkg-deb -x "$DEB" "./slipstream.unpacked"
 }
 
 slipstream_file() {
@@ -87,18 +84,18 @@
 	RELPATH="$2"
 	BN=`basename "$FILE"`
 
-	cp -p "$FILE" "./foo/$RELPATH/$BN"
-	chmod 644 "./foo/$RELPATH/$BN"
+	cp -p "$FILE" "./slipstream.unpacked/$RELPATH/$BN"
+	chmod 644 "./slipstream.unpacked/$RELPATH/$BN"
 
 	# add a line to md5sums
-	cd foo
+	cd slipstream.unpacked
 	md5sum "$RELPATH/$BN" >> "../DEBIAN/md5sums"
 	cd ..
 }
 
 slipstream_instsize() {
 	# figure out the new installed-size
-	INSTSIZE=`du -sk ./foo | cut -f1`
+	INSTSIZE=`du -sk ./slipstream.unpacked | cut -f1`
 	sed -i  "s/^Installed-Size.*/Installed-Size: $INSTSIZE/" \
 		"./DEBIAN/control"
 }
@@ -107,20 +104,23 @@
 	DEB="$1"     # the .deb file we are going to mangle
 
 	# repack
-	mv DEBIAN foo
+	mv DEBIAN slipstream.unpacked
 	# XXX: capture the output of dpkg-deb and hide it
-	fakeroot dpkg-deb -b foo "$DEB"
+	fakeroot dpkg-deb -b slipstream.unpacked "$DEB" | ( \
+		grep -v "^dpkg-deb: building package \`doom-wad' in \`$DEB'."\
+		|| true)
+
 }
 
 slipstream_cleanup() {
-	rm -rf ./foo
+	rm -rf ./slipstream.unpacked
 }
 
 # stuff relating to installing the generated packages ########################
 
 install_deb() {
 	DEB="$1"
-	sudo dpkg -i "$DEB"
+	sudo gdebi "$DEB"
 }
 
 unravel() {
@@ -134,3 +134,6 @@
 
 	echo $FILE
 }
+
+GAME_PACKAGE_VERSION=`dpkg-query --showformat='${Version}\n' \
+	--show game-package`

Modified: packages/branches/game-package/support_quake3/supported/doom
===================================================================
--- packages/branches/game-package/support_quake3/supported/doom	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/supported/doom	2008-06-30 09:36:43 UTC (rev 7604)
@@ -1,9 +1,9 @@
 # vim: set ft=sh:
 
 SHORTNAME=doom
-LONGNAME="Doom"
+LONGNAME="Doom (including Ultimate Doom)"
 
-DEBBASE="doom-wad_7_all.deb"
+DEBBASE="doom-wad_${GAME_PACKAGE_VERSION}_all.deb"
 
 doom2_usage() {
 	echo "doom game arguments:"  >&2
@@ -27,8 +27,11 @@
 check_for_v19() {
 	case "$MD5SUM" in
 		"c4fe9fd920207691a9f493668e0a2083")
-			debug "doom.wad is a v1.9 IWAD"
+			debug "doom.wad is a v1.9 IWAD (ultimate doom)"
 			;;
+		"1cd63c5ddff1bf8ce844237f580e9cf3")
+			debug "doom.wad is a v1.9 IWAD (registered)"
+			;;
 		*)
 			warn "the doom.wad file is not version 1.9"
 			warn "(or has been modified)"
@@ -55,8 +58,10 @@
 
 	DEST=`echo $DATADIR | sed 's,^/,,'`
 
-	if [ "" = "$OUTFILE" ]; then
-		OUTFILE=`mktemp -t game-package.doom.XXXXXX`
+	if [ "" = "$OUTDIR" ]; then
+		OUTFILE="$WORKDIR/out.deb"
+	else
+		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
 	fi
 	cp -p "$DEB" "$OUTFILE"
 	slipstream "$OUTFILE" "$DEST" "$WADFILE"

Modified: packages/branches/game-package/support_quake3/supported/doom2
===================================================================
--- packages/branches/game-package/support_quake3/supported/doom2	2008-06-30 09:32:19 UTC (rev 7603)
+++ packages/branches/game-package/support_quake3/supported/doom2	2008-06-30 09:36:43 UTC (rev 7604)
@@ -3,7 +3,7 @@
 SHORTNAME=doom2
 LONGNAME="Doom 2"
 
-DEBBASE="doom2-wad_7_all.deb"
+DEBBASE="doom2-wad_${GAME_PACKAGE_VERSION}_all.deb"
 
 doom2_usage() {
 	echo "doom2 game arguments:"  >&2
@@ -48,14 +48,16 @@
 
 go() {
 	verify_args $*
-	WADFILE="$1"
+	WADFILE=`unravel "$1"`
 	MD5SUM=`checksum "$WADFILE"`
 	check_for_v19
-
+	debug "WADFILE=$WADFILE"
 	DEST=`echo $DATADIR | sed 's,^/,,'`
 
-	if [ "" = "$OUTFILE" ]; then
-		OUTFILE=`mktemp -t game-package.doom2.XXXXXX`
+	if [ "" = "$OUTDIR" ]; then
+		OUTFILE="$WORKDIR/out.deb"
+	else
+		OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
 	fi
 	cp -p "$DEB" "$OUTFILE"
 	slipstream "$OUTFILE" "$DEST" "$WADFILE"




More information about the Pkg-games-commits mailing list