Hi Fabian,

> Fabian Greffrath <fab...@greffrath.com> schrieb am 19:58 Freitag, 31.Januar 
> 2014:

> > Am Freitag, den 31.01.2014, 19:56 +0100 schrieb Fabian Greffrath: 
> 
>>  PS: I know this is getting perky, but now that you have practice at it,
>>  would you mind adding Chex Quest(R) and the Hacx 1.2 IWAD as well? ;)
> 
> Oh, and "No Rest For The Living" aka pack_nerve aka nerve.wad?

I'm not owning "Chex Quest 1" and "No Rest For The Living" but I added support 
for
"Chex Quest 3" and "HacX" as they are freely available.

BTW. I'm suggesting moving the desktop entries into a subcategory. Judging from
/etc/xdg/kde4-applications.menu it looks like 'ArcadeGame' would be the right 
one.
From cb2ddb37e16bb9daa14cb7bc0bbf8115d6b19d8a Mon Sep 17 00:00:00 2001
From: Johey Shmit <joheysh...@yahoo.com>
Date: Sat, 1 Feb 2014 14:27:36 +0100
Subject: [PATCH 2/3] added support for Chex Quest 3 and HacX

Signed-off-by: Johey Shmit <joheysh...@yahoo.com>
---
 Makefile                                           | 14 ++++++++-
 chex3/DEBIAN/control.in                            | 15 ++++++++++
 debian/control                                     |  4 +--
 doom-common.mk                                     |  8 +++++
 .../usr/share/applications/chex3.desktop.in        |  9 ++++++
 doom-common/usr/share/applications/hacx.desktop.in |  9 ++++++
 hacx/DEBIAN/control.in                             | 15 ++++++++++
 lib/chex3-mirrors                                  |  1 +
 lib/doom-common                                    | 12 ++++----
 lib/hacx-mirrors                                   |  4 +++
 supported/chex3                                    | 34 ++++++++++++++++++++++
 supported/hacx                                     | 34 ++++++++++++++++++++++
 12 files changed, 149 insertions(+), 10 deletions(-)
 create mode 100644 chex3/DEBIAN/control.in
 create mode 100644 doom-common/usr/share/applications/chex3.desktop.in
 create mode 100644 doom-common/usr/share/applications/hacx.desktop.in
 create mode 100644 hacx/DEBIAN/control.in
 create mode 100644 lib/chex3-mirrors
 create mode 100644 lib/hacx-mirrors
 create mode 100644 supported/chex3
 create mode 100644 supported/hacx

diff --git a/Makefile b/Makefile
index 88f3cc3..2f7a81a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,13 @@ default: $(DIRS)
 		LONG="Strife Shareware"
 	make -f doom-common.mk IWAD=strife GAME=strife VERSION=$(VERSION) \
 		CONTROLIN=strife/DEBIAN/control.in \
-		LONG="Strife Quest for the Sigil"
+		LONG="Strife: Quest for the Sigil"
+	make -f doom-common.mk IWAD=chex3 GAME=chex3 VERSION=$(VERSION) \
+		CONTROLIN=chex3/DEBIAN/control.in \
+		LONG="Chex Quest 3"
+	make -f doom-common.mk IWAD=hacx GAME=hacx VERSION=$(VERSION) \
+		CONTROLIN=hacx/DEBIAN/control.in \
+		LONG="HacX"
 	make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-registered \
 		FOLDER=id1
 	make -f quake.mk LONG="Quake music" VERSION=$(VERSION) \
@@ -92,6 +98,12 @@ clean:
 	make -f doom-common.mk IWAD=strife VERSION=$(VERSION) \
 		CONTROLIN=strife/DEBIAN/control.in \
 		LONG="Strife: Quest for the Sigil" clean
+	make -f doom-common.mk IWAD=chex3 VERSION=$(VERSION) \
+		CONTROLIN=chex3/DEBIAN/control.in \
+		LONG="Chex Quest 3" clean
+	make -f doom-common.mk IWAD=hacx VERSION=$(VERSION) \
+		CONTROLIN=hacx/DEBIAN/control.in \
+		LONG="HacX" 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 --git a/chex3/DEBIAN/control.in b/chex3/DEBIAN/control.in
new file mode 100644
index 0000000..eb17361
--- /dev/null
+++ b/chex3/DEBIAN/control.in
@@ -0,0 +1,15 @@
+Package: PACKAGE
+Section: non-free/games
+Priority: optional
+Architecture: all
+Multi-Arch: foreign
+Recommends: chocolate-doom | chex3-engine
+Breaks: chocolate-doom (<< 2)
+Provides: chex3-wad
+Installed-Size: 56
+Version: VERSION
+Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
+Description: IWADs from Charles Jacobi's Chex Quest 3 computer game
+ Chex Quest 3 requires both a chex3-engine and an IWAD file to play.
+ This package contains the IWAD from Charles Jacobi's game "Chex Quest 3"
+ and was generated using the "game-data-packager" program.
diff --git a/debian/control b/debian/control
index da9543e..891c001 100644
--- a/debian/control
+++ b/debian/control
@@ -36,5 +36,5 @@ Description: Installer for game data files
  .
  At the moment, game-data-packager has support for building .deb
  files for Doom games (Doom, Doom 2 and Final Doom); LGeneral;
- Heretic; Hexen; Hexen 2; Rise of the Triad; Quake; Quake II; Quake III Arena
- and Wolfenstein 3D.
+ Heretic; Hexen; Hexen 2; Rise of the Triad; Quake; Quake II; Quake III Arena;
+ Wolfenstein 3D; Strife; Chex Quest 3 and HacX.
diff --git a/doom-common.mk b/doom-common.mk
index c316ba5..4f6d476 100644
--- a/doom-common.mk
+++ b/doom-common.mk
@@ -62,6 +62,14 @@ build/$(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop:
 		m4 -DGAME=strife -DLONG="$(LONG)" -DENGINE=$(GAME) \
 			doom-common/usr/share/applications/strife-shareware.desktop.in \
 			> $@ ; \
+	elif [ "$(IWAD)" = chex3 ] ; then \
+		m4 -DGAME=chex3 -DLONG="$(LONG)" -DENGINE=$(GAME) \
+			doom-common/usr/share/applications/chex3.desktop.in \
+			> $@ ; \
+	elif [ "$(IWAD)" = hacx ] ; then \
+		m4 -DGAME=hacx -DLONG="$(LONG)" -DENGINE=$(GAME) \
+			doom-common/usr/share/applications/hacx.desktop.in \
+			> $@ ; \
 	else \
 		m4 -DGAME=$(IWAD) -DLONG="$(LONG)" -DENGINE=$(GAME) \
 			doom-common/usr/share/applications/doom-common.desktop.in \
diff --git a/doom-common/usr/share/applications/chex3.desktop.in b/doom-common/usr/share/applications/chex3.desktop.in
new file mode 100644
index 0000000..6ef4495
--- /dev/null
+++ b/doom-common/usr/share/applications/chex3.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=LONG
+GenericName=First Person Shooter Game
+TryExec=ENGINE
+Exec=ENGINE -iwad /usr/share/games/doom/chex3.wad
+Icon=ENGINE.xpm
+Terminal=false
+Type=Application
+Categories=Game
diff --git a/doom-common/usr/share/applications/hacx.desktop.in b/doom-common/usr/share/applications/hacx.desktop.in
new file mode 100644
index 0000000..0025989
--- /dev/null
+++ b/doom-common/usr/share/applications/hacx.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=LONG
+GenericName=First Person Shooter Game
+TryExec=ENGINE
+Exec=ENGINE -iwad /usr/share/games/doom/hacx.wad
+Icon=ENGINE.xpm
+Terminal=false
+Type=Application
+Categories=Game
diff --git a/hacx/DEBIAN/control.in b/hacx/DEBIAN/control.in
new file mode 100644
index 0000000..a590dc5
--- /dev/null
+++ b/hacx/DEBIAN/control.in
@@ -0,0 +1,15 @@
+Package: PACKAGE
+Section: non-free/games
+Priority: optional
+Architecture: all
+Multi-Arch: foreign
+Recommends: chocolate-doom | hacx-engine
+Breaks: chocolate-doom (<< 2)
+Provides: hacx-wad
+Installed-Size: 56
+Version: VERSION
+Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
+Description: IWADs from Banjo Software's HacX computer game
+ HacX requires both a hacx-engine and an IWAD file to play.
+ This package contains the IWAD from Banjo Software's game "HacX"
+ and was generated using the "game-data-packager" program.
diff --git a/lib/chex3-mirrors b/lib/chex3-mirrors
new file mode 100644
index 0000000..ebfdf8d
--- /dev/null
+++ b/lib/chex3-mirrors
@@ -0,0 +1 @@
+http://www.chucktropolis.com/downloads/ChexQuest3.zip
diff --git a/lib/doom-common b/lib/doom-common
index 6d7b6da..5625733 100644
--- a/lib/doom-common
+++ b/lib/doom-common
@@ -3,7 +3,7 @@ DEBBASE="${SHORTNAME}-wad_${GAME_PACKAGE_VERSION}_all.deb"
 doom_usage() {
 	echo "${SHORTNAME} arguments:"  >&2
 	case ${SHORTNAME} in
-		*-shareware)
+		*-shareware|chex3|hacx)
 			printf "\tgame-data-packager ${SHORTNAME} [ wadfile ] | [ -w ]
 \t\twadfile\t\tpath to a ${SHORTNAME} wad\n\
 \t\t-w\t\tfetch archive from the World Wide Web\n" >&2
@@ -113,18 +113,16 @@ go() {
 			slipstream "$OUTFILE" "$DEST" $strifetmp $voicestmp
 			rm $strifetmp $voicestmp
 			;;
-		*-shareware)
-			debug "running slipstream $OUTFILE $DEST $WADFILE"
-			slipstream "$OUTFILE" "$DEST" "$WADFILE"
-			;;
 		*)
 			# Force lower case for *.wad files
 			WADFILENAME=`basename "$WADFILE" | tr '[:upper:]' '[:lower:]'`
-			ln -sf "$WADFILE" "$WORKDIR/$WADFILENAME"
+			if [ "$WADFILE" != "$WORKDIR/$WADFILENAME" ] ;then
+				debug "copying '$WADFILE' to '$WORKDIR/$WADFILENAME' for further processing"
+				cp "$WADFILE" "$WORKDIR/$WADFILENAME"
+			fi
 			debug "running slipstream $OUTFILE $DEST $WORKDIR/$WADFILENAME"
 			slipstream "$OUTFILE" "$DEST" "$WORKDIR/$WADFILENAME"
 			rm -f "$WORKDIR/$WADFILENAME"
 			;;
 	esac
-	[ $downloaded = true ] && rm $WADFILE
 }
diff --git a/lib/hacx-mirrors b/lib/hacx-mirrors
new file mode 100644
index 0000000..463489e
--- /dev/null
+++ b/lib/hacx-mirrors
@@ -0,0 +1,4 @@
+http://drnostromo.com/hacx/files/hacx12.zip
+ftp://ftp.fu-berlin.de/pc/games/idgames/themes/hacx/hacx12.zip
+ftp://ftp.ntua.gr/pub/vendors/idgames/themes/hacx/hacx12.zip
+ftp://mancubus.net/pub/idgames/themes/hacx/hacx12.zip
diff --git a/supported/chex3 b/supported/chex3
new file mode 100644
index 0000000..0860f61
--- /dev/null
+++ b/supported/chex3
@@ -0,0 +1,34 @@
+SHORTNAME=chex3
+LONGNAME="Chex Quest 3"
+
+check_for_v19() {
+	case "$CHECKSUM" in
+		"bce163d06521f9d15f9686786e64df13")
+			debug "chex3.wad is a version 1.4 IWAD"
+			;;
+		*)
+			warn "the chex3.wad file is not version 1.4"
+			warn "(or has been modified)"
+			warn "you may have some problems playing some PWADs or demos"
+			;;
+	esac
+
+}
+
+check_zip() {
+	case "$ZIPSUM" in
+		"e6e9bec61c1678ee0c883731dd43b60d")
+			debug "ChexQuest3.zip has correct checksum"
+			;;
+		*)
+			die "unknown zipfile downloaded to '$WORKDIR'! Cannot continue!"
+			;;
+	esac
+}
+
+unpack_zip() {
+	unzip -LLqqod $2 $1
+	(cd $2 && rm *.dll *.pk3 *.exe *.txt *.zip) 
+	WADFILE=$2/chex3.wad
+}
+. $LIBDIR/doom-common
diff --git a/supported/hacx b/supported/hacx
new file mode 100644
index 0000000..dd0bd5b
--- /dev/null
+++ b/supported/hacx
@@ -0,0 +1,34 @@
+SHORTNAME=haxc
+LONGNAME="HacX"
+
+check_for_v19() {
+	case "$CHECKSUM" in
+		"65ed74d522bdf6649c2831b13b9e02b4")
+			debug "hacx.wad is a version 1.2 IWAD"
+			;;
+		*)
+			warn "the hacx.wad file is not version 1.2"
+			warn "(or has been modified)"
+			warn "you may have some problems playing some PWADs or demos"
+			;;
+	esac
+
+}
+
+check_zip() {
+	case "$ZIPSUM" in
+		"38cdd2baa912e771da562b44448206ec")
+			debug "hacx12.zip has correct checksum"
+			;;
+		*)
+			die "unknown zipfile downloaded to '$WORKDIR'! Cannot continue!"
+			;;
+	esac
+}
+
+unpack_zip() {
+	unzip -LLqqod $2 $1
+	(cd $2 && rm *.txt *.zip) 
+	WADFILE=$2/hacx.wad
+}
+. $LIBDIR/doom-common
-- 
1.9.rc1

From 8616adc32d3b3c8b720860fb6ad613aef6cf327e Mon Sep 17 00:00:00 2001
From: Johey Shmit <joheysh...@yahoo.com>
Date: Sat, 1 Feb 2014 14:34:15 +0100
Subject: [PATCH 3/3] Fixed typo in filename and SHORTNAME variable

Signed-off-by: Johey Shmit <joheysh...@yahoo.com>
---
 supported/hacx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supported/hacx b/supported/hacx
index dd0bd5b..0522bdf 100644
--- a/supported/hacx
+++ b/supported/hacx
@@ -1,4 +1,4 @@
-SHORTNAME=haxc
+SHORTNAME=hacx
 LONGNAME="HacX"
 
 check_for_v19() {
-- 
1.9.rc1

Reply via email to