Package: game-data-packager
Version: 37
Severity: wishlist

Dear Maintainer,

included is a patch to support the hexen addon 'hexdd.wad'.

This patch also changes the installation folder of heretic and hexen wads
back to /usr/share/games/hexen|heretic as it was before version 30. I originally
suggested the change to put all doom engine files into /usr/share/games/doom
but I now think that was not such a good idea.

Would you consider adding the patch?

One more question: is it allowed to add support for pwads to g-d-p?
Or is there any other recommended way to get pwads packaged?

Best,

Johey
diff -uNr game-data-packager-37/doom-common/usr/share/applications/hexdd.desktop.in game-data-packager-37.patched/doom-common/usr/share/applications/hexdd.desktop.in
--- game-data-packager-37/doom-common/usr/share/applications/hexdd.desktop.in	1970-01-01 01:00:00.000000000 +0100
+++ game-data-packager-37.patched/doom-common/usr/share/applications/hexdd.desktop.in	2014-01-30 15:26:09.887953139 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=LONG
+GenericName=First Person Shooter Game
+TryExec=ENGINE
+Exec=ENGINE -iwad /usr/share/games/ENGINE/hexen.wad -file /usr/share/games/ENGINE/hexdd.wad
+Icon=GAME.xpm
+Terminal=false
+Type=Application
+Categories=Game
diff -uNr game-data-packager-37/doom-common.mk game-data-packager-37.patched/doom-common.mk
--- game-data-packager-37/doom-common.mk	2013-10-13 22:58:10.000000000 +0200
+++ game-data-packager-37.patched/doom-common.mk	2014-01-30 15:00:46.383630600 +0100
@@ -42,9 +42,15 @@
 		> $@
 
 build/$(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop:
-	m4 -DGAME=$(IWAD) -DLONG="$(LONG)" -DENGINE=$(GAME) \
-		doom-common/usr/share/applications/doom-common.desktop.in \
-		> $@
+	if [ "$(IWAD)" = hexdd ] ; then \
+		m4 -DGAME=hexen -DLONG="$(LONG)" -DENGINE=$(GAME) \
+			doom-common/usr/share/applications/hexdd.desktop.in \
+			> $@ ; \
+	else \
+		m4 -DGAME=$(IWAD) -DLONG="$(LONG)" -DENGINE=$(GAME) \
+			doom-common/usr/share/applications/doom-common.desktop.in \
+			> $@ ; \
+	fi
 
 build/$(IWAD)-wad/DEBIAN/preinst:
 	m4 -DIWAD=$(IWAD).wad \
diff -uNr game-data-packager-37/hexdd/DEBIAN/control.in game-data-packager-37.patched/hexdd/DEBIAN/control.in
--- game-data-packager-37/hexdd/DEBIAN/control.in	1970-01-01 01:00:00.000000000 +0100
+++ game-data-packager-37.patched/hexdd/DEBIAN/control.in	2014-01-30 14:33:20.787522733 +0100
@@ -0,0 +1,13 @@
+Package: PACKAGE
+Section: non-free/games
+Priority: optional
+Architecture: all
+Depends: hexen-wad
+Provides: GAME-wad
+Installed-Size: 56
+Version: VERSION
+Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
+Description: Hexen: Deathkings of the Dark Citadel
+ This expansion pack requires both a hexen-engine and a hexen-wad to play.
+ This package contains add-on levels to Raven Software's game "hexen"
+ and was generated using the "game-data-packager" program.
diff -uNr game-data-packager-37/lib/doom-common game-data-packager-37.patched/lib/doom-common
--- game-data-packager-37/lib/doom-common	2013-10-13 22:58:10.000000000 +0200
+++ game-data-packager-37.patched/lib/doom-common	2014-01-30 15:42:19.040182483 +0100
@@ -18,7 +18,9 @@
 	debug "checksum = $CHECKSUM"
 }
 
-WADDIR="/usr/share/games/doom"
+set +u
+[ -n "$WADDIR" ] || WADDIR="/usr/share/games/doom"
+set -u
 DEB="$DATADIR/$DEBBASE"
 
 go() {
diff -uNr game-data-packager-37/Makefile game-data-packager-37.patched/Makefile
--- game-data-packager-37/Makefile	2013-11-18 20:32:13.000000000 +0100
+++ game-data-packager-37.patched/Makefile	2014-01-30 15:00:02.099629764 +0100
@@ -13,11 +13,14 @@
 	make -f doom-common.mk IWAD=plutonia \
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
-		CONTROLIN=heretic/DEBIAN/control.in \
+		CONTROLIN=heretic/DEBIAN/control.in GAME=heretic \
 		LONG="Heretic: Shadow of the Serpent Riders"
 	make -f doom-common.mk IWAD=hexen VERSION=$(VERSION) \
-		CONTROLIN=hexen/DEBIAN/control.in \
+		CONTROLIN=hexen/DEBIAN/control.in GAME=hexen \
 		LONG="Hexen: Beyond Heretic"
+	make -f doom-common.mk IWAD=hexdd VERSION=$(VERSION) \
+		CONTROLIN=hexdd/DEBIAN/control.in GAME=hexen \
+		LONG="Hexen: Deathkings of the Dark Citadel"
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1
 	make -f quake.mk LONG="Quake music" VERSION=$(VERSION) \
@@ -59,11 +62,14 @@
 	make -f doom-common.mk IWAD=plutonia \
 		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION) clean
 	make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
-		CONTROLIN=heretic/DEBIAN/control.in \
+		CONTROLIN=heretic/DEBIAN/control.in GAME=heretic \
 		LONG="Heretic: Shadow of the Serpent Riders" clean
 	make -f doom-common.mk IWAD=hexen VERSION=$(VERSION) \
-		CONTROLIN=hexen/DEBIAN/control.in \
+		CONTROLIN=hexen/DEBIAN/control.in GAME=hexen \
 		LONG="Hexen: Beyond Heretic" clean
+	make -f doom-common.mk IWAD=hexdd VERSION=$(VERSION) \
+		CONTROLIN=hexdd/DEBIAN/control.in GAME=hexen \
+		LONG="Hexen: Deathkings of the Dark Citadel" clean
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1 clean
 	make -f quake.mk LONG="Quake music" VERSION=$(VERSION) \
diff -uNr game-data-packager-37/supported/heretic game-data-packager-37.patched/supported/heretic
--- game-data-packager-37/supported/heretic	2013-10-13 22:58:10.000000000 +0200
+++ game-data-packager-37.patched/supported/heretic	2014-01-30 14:58:25.719627325 +0100
@@ -14,5 +14,5 @@
 	esac
 
 }
-
+WADDIR="/usr/share/games/heretic"
 . $LIBDIR/doom-common
diff -uNr game-data-packager-37/supported/hexdd game-data-packager-37.patched/supported/hexdd
--- game-data-packager-37/supported/hexdd	1970-01-01 01:00:00.000000000 +0100
+++ game-data-packager-37.patched/supported/hexdd	2014-01-30 14:57:40.675626909 +0100
@@ -0,0 +1,18 @@
+SHORTNAME=hexdd
+LONGNAME="Hexen: Deathkings of the Dark Citadel"
+
+check_for_v19() {
+	case "$CHECKSUM" in
+		"78d5898e99e220e4de64edaa0e479593")
+			debug "hexdd.wad is newest version 1.1"
+			;;
+		*)
+			warn "the hexdd.wad file is not the newest version 1.1"
+			warn "(or has been modified)"
+			warn "you may have some problems playing some PWADs or demos"
+			;;
+	esac
+
+}
+WADDIR="/usr/share/games/hexen"
+. $LIBDIR/doom-common
diff -uNr game-data-packager-37/supported/hexen game-data-packager-37.patched/supported/hexen
--- game-data-packager-37/supported/hexen	2013-10-13 22:58:10.000000000 +0200
+++ game-data-packager-37.patched/supported/hexen	2014-01-30 14:58:07.523624216 +0100
@@ -14,5 +14,5 @@
 	esac
 
 }
-
+WADDIR="/usr/share/games/hexen"
 . $LIBDIR/doom-common

Reply via email to