[SCM] Installer for game data files branch, quake, updated. 1f90b116ccca532acc17dd77a8261cff54f9e471

[Jon Dowland]

The following commit has been merged in the quake branch:
commit bb31c5e8dbcbd142a4dc467c20d06242f588abd9
Author: Jon Dowland <jmtd at debian.org>
Date:   Thu Apr 7 17:13:18 2011 +0100

    quake: separate quake-shareware template .deb

diff --git a/Makefile b/Makefile
index 53de000..875de01 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ default: $(DIRS)
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION)
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-data
+	make -f quake.mk LONG="Quake shareware" VERSION=$(VERSION) PACKAGE=quake-shareware
 	make -f rott.mk VERSION=$(VERSION)
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
 		CONTROLIN=heretic/DEBIAN/control.in \
@@ -29,6 +30,7 @@ clean:
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION) clean
 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION) clean
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) clean PACKAGE=quake-data
+	make -f quake.mk LONG="Quake shareware" VERSION=$(VERSION) PACKAGE=quake-shareware clean
 	make -f rott.mk VERSION=$(VERSION) clean
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
 		CONTROLIN=heretic/DEBIAN/control.in \
diff --git a/quake-common/DEBIAN/control.in b/quake-common/DEBIAN/control.in
index 875d98f..1e898e4 100644
--- a/quake-common/DEBIAN/control.in
+++ b/quake-common/DEBIAN/control.in
@@ -8,9 +8,9 @@ Installed-Size: 500000
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Description: Quake commercial data files
  Quake requires an engine and game data to play. This package contains
- the commercial data from id Software's game "Quake", and was generated
- using the "game-data-packager" program from the Debian package of
- the same name.
+ the commercial data from id Software's game "LONG",
+ and was generated using the "game-data-packager" program from the Debian
+ package of the same name.
  .
  To play Quake using this data, install a package providing the
  "quake-engine" virtual package.
diff --git a/quake.mk b/quake.mk
index 39133cb..d4064a9 100644
--- a/quake.mk
+++ b/quake.mk
@@ -1,4 +1,4 @@
-# VERSION and PACKAGE must be supplied by caller
+# VERSION, PACKAGE and LONG must be supplied by caller
 
 srcdir = $(CURDIR)
 builddir = $(CURDIR)/build
@@ -35,7 +35,8 @@ $(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright: quake-common/copyrigh
 
 $(builddir)/$(PACKAGE)/DEBIAN/control: quake-common/DEBIAN/control.in
 	install -d `dirname $@`
-	m4 -DVERSION=$(VERSION) < quake-common/DEBIAN/control.in > $@
+	m4 -DVERSION=$(VERSION) -DPACKAGE=$(PACKAGE) -DLONG="$(LONG)" \
+	     < quake-common/DEBIAN/control.in > $@
 
 fixperms:
 	find $(builddir)/$(PACKAGE) -type f -print0 | xargs -0 chmod 644
diff --git a/supported/quake b/supported/quake
index 83f637e..c9a5dbe 100644
--- a/supported/quake
+++ b/supported/quake
@@ -135,8 +135,6 @@ swzip_method() {
     common_method
 }
 
-DEBBASE="quake-data_${GAME_PACKAGE_VERSION}_all.deb"
-DEB="$DATADIR/$DEBBASE"
 
 common_method() {
     pak0sum=85fc9cee2035b66290da1e33be2ac86b
@@ -145,8 +143,11 @@ common_method() {
     [ "$method" = "swzip" ] || verify_md5sum "$pak0" "$pak0sum"
     [ "$method" = "swzip" ] || verify_md5sum "$pak1" "$pak1sum"
 
+    DEBBASE="quake-data_${GAME_PACKAGE_VERSION}_all.deb"
+    [ "$method" != "swzip" ] || \
+        DEBBASE="quake-shareware_${GAME_PACKAGE_VERSION}_all.deb"
     OUTFILE=`unravel "$OUTDIR"`"/$DEBBASE"
-    cp -p "$DEB" "$OUTFILE"
+    cp -p "$DATADIR/$DEBBASE" "$OUTFILE"
 
     if [ "$method" = "swzip" ]; then
         slipstream "$OUTFILE" "usr/share/games/quake/id1/" "$pak0"

-- 
Installer for game data files