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

[Jon Dowland]

Author: jmtd-guest
Date: 2008-03-15 18:09:24 +0000 (Sat, 15 Mar 2008)
New Revision: 6081

Modified:
   packages/trunk/game-package/Makefile
   packages/trunk/game-package/debian/changelog
   packages/trunk/game-package/debian/game-package.install
   packages/trunk/game-package/debian/rules
   packages/trunk/game-package/supported/doom
Log:
determine package version in debian/rules, cascade to ./Makefile

Modified: packages/trunk/game-package/Makefile
===================================================================
--- packages/trunk/game-package/Makefile	2008-03-15 17:54:52 UTC (rev 6080)
+++ packages/trunk/game-package/Makefile	2008-03-15 18:09:24 UTC (rev 6081)
@@ -1,15 +1,9 @@
-BINDIR=$(DESTDIR)/usr/games
-DATADIR=$(DESTDIR)/usr/share/games/game-package
-MANDIR=$(DESTDIR)/usr/share/man
+DOOM2DEB=doom2-wad_$(VERSION)_all.deb
+DOOMDEB=doom-wad_$(VERSION)_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
-
 # general targets ############################################################
 
-default: $(DOOM2DEB) $(QUAKE3DEB) $(DOOMDEB)
+default: $(DOOM2DEB) $(DOOMDEB)
 
 # necessary as dpkg-source will honour the shell's umask
 fixperms: fixperms_doom2 fixperms_doom

Modified: packages/trunk/game-package/debian/changelog
===================================================================
--- packages/trunk/game-package/debian/changelog	2008-03-15 17:54:52 UTC (rev 6080)
+++ packages/trunk/game-package/debian/changelog	2008-03-15 18:09:24 UTC (rev 6081)
@@ -9,8 +9,15 @@
   [ 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
 
- -- Jon Dowland <jon at alcopop.org>  Sat, 15 Mar 2008 14:28:28 +0000
+ -- Jon Dowland <jon at alcopop.org>  Sat, 15 Mar 2008 18:08:10 +0000
 
 games-package (16) unstable; urgency=low
 

Modified: packages/trunk/game-package/debian/game-package.install
===================================================================
--- packages/trunk/game-package/debian/game-package.install	2008-03-15 17:54:52 UTC (rev 6080)
+++ packages/trunk/game-package/debian/game-package.install	2008-03-15 18:09:24 UTC (rev 6081)
@@ -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/trunk/game-package/debian/rules
===================================================================
--- packages/trunk/game-package/debian/rules	2008-03-15 17:54:52 UTC (rev 6080)
+++ packages/trunk/game-package/debian/rules	2008-03-15 18:09:24 UTC (rev 6081)
@@ -16,14 +16,14 @@
 	# 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
-	$(MAKE)
+	$(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
 	rm -f doom2-wad/usr/share/doc/doom2-wad/changelog.gz
 	dh_clean

Modified: packages/trunk/game-package/supported/doom
===================================================================
--- packages/trunk/game-package/supported/doom	2008-03-15 17:54:52 UTC (rev 6080)
+++ packages/trunk/game-package/supported/doom	2008-03-15 18:09:24 UTC (rev 6081)
@@ -3,7 +3,8 @@
 SHORTNAME=doom
 LONGNAME="Doom"
 
-DEBBASE="doom-wad_7_all.deb"
+VERSION=` dpkg-query --showformat='${Version}\n' --show game-package `
+DEBBASE="doom-wad_${VERSION}_all.deb"
 
 doom2_usage() {
 	echo "doom game arguments:"  >&2