[SCM] Installer for game data files branch, master, updated. 6795cb7e5dd00638f0c35df525730c994dc65347

[Jon Dowland]

The following commit has been merged in the master branch:
commit 68af7e52f5f9c3fd7e4561d961999b7d2a1389ca
Author: Jon Dowland <jmtd at debian.org>
Date:   Sun Jan 23 18:31:12 2011 +0000

    step 1: template deb

diff --git a/Makefile b/Makefile
index 8a199b9..ce6cbe1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ default: $(DIRS)
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION)
 	make -f rott.mk VERSION=$(VERSION)
+	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
+		CONTROLIN=heretic/DEBIAN/control.in \
+		LONG="Heretic: Shadow of the Serpent Riders" GAME=heretic
 
 $(DIRS):
 	mkdir -p $@
@@ -25,6 +28,9 @@ clean:
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION) clean
 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION) clean
 	make -f rott.mk VERSION=$(VERSION) clean
+	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
+		CONTROLIN=heretic/DEBIAN/control.in \
+		LONG="Heretic: Shadow of the Serpent Riders" GAME=heretic clean
 	for d in $(DIRS); do [ ! -d "$$d" ]  || rmdir "$$d"; done
 
 .PHONY: default clean
diff --git a/doom-common.mk b/doom-common.mk
index 5330901..8c083f1 100644
--- a/doom-common.mk
+++ b/doom-common.mk
@@ -8,6 +8,10 @@ $(IWAD)DEB=out/$(IWAD)-wad_$(VERSION)_all.deb
 
 $(IWAD)TARGETS := $(addprefix build/, $(IWAD)DIRS $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/preinst $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright $(IWAD)-wad/DEBIAN/md5sums)
 
+# defined as a variable so it can be overriden by the caller, e.g. heretic
+GAME = doom
+CONTROLIN = doom-common/DEBIAN/control.in
+
 DIRS := \
 	$(IWAD)-wad/DEBIAN \
 	$(IWAD)-wad/usr/share/pixmaps \
@@ -15,7 +19,7 @@ DIRS := \
 	$(IWAD)-wad/usr/share/doc/$(IWAD)-wad \
 	$(IWAD)-wad/usr/share/doc \
 	$(IWAD)-wad/usr/share/games/game-data-packager \
-	$(IWAD)-wad/usr/share/games/doom \
+	$(IWAD)-wad/usr/share/games/$(GAME) \
 	$(IWAD)-wad/usr/share/games \
 	$(IWAD)-wad/usr/share \
 	$(IWAD)-wad/usr \
@@ -38,17 +42,17 @@ build/$(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian:
 		> $@
 
 build/$(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop:
-	m4 -DGAME=$(IWAD) -DLONG="$(LONG)" \
+	m4 -DGAME=$(IWAD) -DLONG="$(LONG)" -DENGINE=$(GAME) \
 		doom-common/usr/share/applications/doom-common.desktop.in \
-	> $@
+		> $@
 
 build/$(IWAD)-wad/DEBIAN/preinst:
 	m4 -DIWAD=$(IWAD).wad \
 		doom-common/DEBIAN/preinst.in > $@
 
-build/$(IWAD)-wad/DEBIAN/control: doom-common/DEBIAN/control.in
+build/$(IWAD)-wad/DEBIAN/control: $(CONTROLIN)
 	m4 -DPACKAGE=$(IWAD)-wad -DGAME=$(IWAD) -DVERSION=$(VERSION) \
-		doom-common/DEBIAN/control.in > $@
+		-DENGINE=$(GAME) $(CONTROLIN) > $@
 
 build/$(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz:
 	gzip -c9 debian/changelog > $@
diff --git a/doom-common/DEBIAN/control.in b/doom-common/DEBIAN/control.in
index 689abb1..778e657 100644
--- a/doom-common/DEBIAN/control.in
+++ b/doom-common/DEBIAN/control.in
@@ -8,7 +8,7 @@ Installed-Size: 56
 Conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4)
 Version: VERSION
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Description: IWAD from ID Software's GAME computer game
+Description: IWAD from ID Software's $(LONG) computer game
  Doom requires both a doom-engine and a doom-wad to play. This package
  contains the IWAD from ID Software's game "GAME"
  and was generated using the "game-data-packager" program.
diff --git a/doom-common/usr/share/applications/doom-common.desktop.in b/doom-common/usr/share/applications/doom-common.desktop.in
index b6c4ee1..b0eebfd 100644
--- a/doom-common/usr/share/applications/doom-common.desktop.in
+++ b/doom-common/usr/share/applications/doom-common.desktop.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=LONG
 GenericName=First Person Shooter Game
-TryExec=doom
-Exec=doom -iwad /usr/share/games/doom/GAME.wad
+TryExec=ENGINE
+Exec=ENGINE -iwad /usr/share/games/ENGINE/GAME.wad
 Icon=GAME.xpm
 Terminal=false
 Type=Application
diff --git a/doom-common/DEBIAN/control.in b/heretic/DEBIAN/control.in
similarity index 56%
copy from doom-common/DEBIAN/control.in
copy to heretic/DEBIAN/control.in
index 689abb1..efeb58d 100644
--- a/doom-common/DEBIAN/control.in
+++ b/heretic/DEBIAN/control.in
@@ -2,13 +2,12 @@ Package: PACKAGE
 Section: non-free/games
 Priority: optional
 Architecture: all
-Recommends: doom-engine
-Provides: doom-wad
+Recommends: heretic-engine
+Provides: heretic-wad
 Installed-Size: 56
-Conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4)
 Version: VERSION
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Description: IWAD from ID Software's GAME computer game
- Doom requires both a doom-engine and a doom-wad to play. This package
+Description: IWAD from Raven Software's heretic computer game
+ Heretic requires both a heretic-engine and a heretic-wad to play. This package
  contains the IWAD from ID Software's game "GAME"
  and was generated using the "game-data-packager" program.

-- 
Installer for game data files