r4999 - in packages/trunk/game-package: . debian supported

[Jon Dowland]

Author: jmtd-guest
Date: 2007-12-17 23:07:20 +0000 (Mon, 17 Dec 2007)
New Revision: 4999

Modified:
   packages/trunk/game-package/Makefile
   packages/trunk/game-package/debian/changelog
   packages/trunk/game-package/debian/control
   packages/trunk/game-package/debian/dirs
   packages/trunk/game-package/game-package
   packages/trunk/game-package/make-wad-package
   packages/trunk/game-package/supported/doom2
Log:
merge changes from local dir


Modified: packages/trunk/game-package/Makefile
===================================================================
--- packages/trunk/game-package/Makefile	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/Makefile	2007-12-17 23:07:20 UTC (rev 4999)
@@ -14,7 +14,13 @@
 # necessary as dpkg-source will honour the shell's umask
 fixperms: fixperms_doom2 fixperms_quake3
 install:  install_doom2 install_quake3
-	install -p -m 0755 game-package-shared $(DESTDIR)/usr/lib/game-package
+	install -p -m 0755 game-package-shared \
+		$(DESTDIR)/usr/lib/game-package/game-package-shared
+	install -p -m 0755 game-package $(DESTDIR)/usr/games/game-package
+	install -p -m 0644 supported/doom2 \
+		$(DESTDIR)/usr/share/games/game-package/supported/doom2
+	install -p -m 0644 etc/game-package.conf \
+		$(DESTDIR)/etc/game-package.conf
 clean:    clean_doom2 clean_quake3
 
 .PHONY: clean doom2-wad/DEBIAN/md5sums fixperms

Modified: packages/trunk/game-package/debian/changelog
===================================================================
--- packages/trunk/game-package/debian/changelog	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/debian/changelog	2007-12-17 23:07:20 UTC (rev 4999)
@@ -1,3 +1,9 @@
+game-package (17) unstable; urgency=low
+
+  * add a generic game-package binary
+
+ -- Jon Dowland <jon at alcopop.org>  Mon, 03 Dec 2007 22:35:52 +0000
+
 games-package (16) unstable; urgency=low
 
   * side-work to develop something for quake3

Modified: packages/trunk/game-package/debian/control
===================================================================
--- packages/trunk/game-package/debian/control	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/debian/control	2007-12-17 23:07:20 UTC (rev 4999)
@@ -1,4 +1,4 @@
-Source: games-package
+Source: game-package
 Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>> 4.0.0), fakeroot
 Standards-Version: 3.7.2
 
-Package: games-package
+Package: game-package
 Depends: fakeroot
 Conflicts: doom-package
 Replaces: doom-package

Modified: packages/trunk/game-package/debian/dirs
===================================================================
--- packages/trunk/game-package/debian/dirs	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/debian/dirs	2007-12-17 23:07:20 UTC (rev 4999)
@@ -1,4 +1,6 @@
 usr/games
 usr/share/man/man6
 usr/share/games/game-package
+usr/share/games/game-package/supported
 usr/lib/game-package
+etc

Modified: packages/trunk/game-package/game-package
===================================================================
--- packages/trunk/game-package/game-package	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/game-package	2007-12-17 23:07:20 UTC (rev 4999)
@@ -5,7 +5,7 @@
 if [ -d ./supported ]; then
 	SUPPORTED=./supported
 else
-	SUPPORTED=/usr/share/lib/games/game-package/supported
+	SUPPORTED=/usr/share/games/game-package/supported
 fi
 
 if [ -f ./game-package-shared ]; then

Modified: packages/trunk/game-package/make-wad-package
===================================================================
--- packages/trunk/game-package/make-wad-package	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/make-wad-package	2007-12-17 23:07:20 UTC (rev 4999)
@@ -10,7 +10,7 @@
 	# saves the resulting .deb in the current directory
 
 DATADIR="usr/share/games/doom-package"
-DEB="/$DATADIR/doom2-wad_5_all.deb"
+DEB="/$DATADIR/doom2-wad_6_all.deb"
 
 if [ -f ./game-package-shared ]; then
 	. ./game-package-shared

Modified: packages/trunk/game-package/supported/doom2
===================================================================
--- packages/trunk/game-package/supported/doom2	2007-12-17 23:03:30 UTC (rev 4998)
+++ packages/trunk/game-package/supported/doom2	2007-12-17 23:07:20 UTC (rev 4999)
@@ -3,6 +3,8 @@
 SHORTNAME=doom2
 LONGNAME="Doom 2"
 
+DEBBASE="doom2-wad_6_all.deb"
+
 doom2_usage() {
 	echo "doom2 game arguments:"  >&2
 	printf "\twadfile - path to a doom2.wad\n"
@@ -35,8 +37,7 @@
 
 }
 
-DEBBASE="doom2-wad_5_all.deb"
-DATADIR="/usr/share/games/doom-package"
+DATADIR="/usr/share/games/game-package"
 
 # XXX: is PWD a bashism?
 if [ -f "$PWD/$DEBBASE" ]; then