Author: jmtd-guest
Date: 2008-03-15 14:24:26 +0000 (Sat, 15 Mar 2008)
New Revision: 6067
Added:
packages/trunk/game-package/doom-wad/
packages/trunk/game-package/supported/doom
Modified:
packages/trunk/game-package/Makefile
packages/trunk/game-package/debian/changelog
packages/trunk/game-package/doom2-wad/DEBIAN/control
packages/trunk/game-package/doom2-wad/usr/share/applications/doom2-wad.desktop
packages/trunk/game-package/doom2-wad/usr/share/doc/doom2-wad/copyright
Log:
merge support_doom1 branch into trunk
Modified: packages/trunk/game-package/Makefile
===================================================================
--- packages/trunk/game-package/Makefile 2008-03-15 14:22:15 UTC (rev
6066)
+++ packages/trunk/game-package/Makefile 2008-03-15 14:24:26 UTC (rev
6067)
@@ -6,28 +6,31 @@
QUAKE3DEB=quake3-data_$(QUAKE3VER)_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)
+default: $(DOOM2DEB) $(QUAKE3DEB) $(DOOMDEB)
# necessary as dpkg-source will honour the shell's umask
-fixperms: fixperms_doom2 fixperms_quake3
-install: install_doom2 install_quake3
+fixperms: fixperms_doom2 fixperms_quake3 fixperms_doom
+install: install_doom2 install_quake3 install_doom
install -p -m 0755 game-package-shared \
$(DESTDIR)/usr/lib/game-package/game-package-shared
install -p -m 0755 game-package $(DESTDIR)/usr/games/game-package
install -p -m 0644 supported/doom2 \
$(DESTDIR)/usr/share/games/game-package/supported/doom2
+ install -p -m 0644 supported/doom \
+ $(DESTDIR)/usr/share/games/game-package/supported/doom
install -p -m 0644 etc/game-package.conf \
$(DESTDIR)/etc/game-package.conf
-clean: clean_doom2 clean_quake3
+clean: clean_doom2 clean_quake3 clean_doom
.PHONY: clean doom2-wad/DEBIAN/md5sums fixperms
# DOOM2 stuff ################################################################
-
$(DOOM2DEB): doom2-wad/DEBIAN/md5sums fixperms
if [ `id -u` -eq 0 ]; then \
dpkg-deb -b doom2-wad $@ ; \
@@ -53,6 +56,34 @@
clean_doom2:
rm -f $(DOOM2DEB) doom2-wad/DEBIAN/md5sums
+# DOOM stuff ################################################################
+
+$(DOOMDEB): doom-wad/DEBIAN/md5sums fixperms
+ if [ `id -u` -eq 0 ]; then \
+ dpkg-deb -b doom-wad $@ ; \
+ else \
+ fakeroot dpkg-deb -b doom-wad $@; \
+ fi
+
+doom-wad/DEBIAN/md5sums:
+ cd doom-wad && find usr/ -type f -print0 |\
+ xargs -0 md5sum >DEBIAN/md5sums
+
+fixperms_doom:
+ find doom-wad -type f -print0 | xargs -0 chmod 644
+ find doom-wad -type d -print0 | xargs -0 chmod 755
+ chmod 755 doom-wad/DEBIAN/postinst
+ chmod 755 doom-wad/DEBIAN/prerm
+
+install_doom:
+ install -p -m 0755 make-wad-package $(BINDIR)/
+ install -p -m 0644 make-wad-package.6 $(MANDIR)/man6/
+ install -p -m 0644 $(DOOMDEB) $(DATADIR)/
+
+clean_doom:
+ rm -f $(DOOMDEB) doom-wad/DEBIAN/md5sums
+
+
# QUAKE3 stuff ###############################################################
Modified: packages/trunk/game-package/debian/changelog
===================================================================
--- packages/trunk/game-package/debian/changelog 2008-03-15 14:22:15 UTC
(rev 6066)
+++ packages/trunk/game-package/debian/changelog 2008-03-15 14:24:26 UTC
(rev 6067)
@@ -6,8 +6,11 @@
[ Eddy Petrișor ]
* add missing Vcs-Svn headers
- -- Eddy Petrișor <[EMAIL PROTECTED]> Wed, 05 Mar 2008 02:27:22 +0200
+ [ Jon Dowland ]
+ * add support for (ultimate) doom
+ -- Jon Dowland <[EMAIL PROTECTED]> Sat, 15 Mar 2008 14:18:57 +0000
+
games-package (16) unstable; urgency=low
* side-work to develop something for quake3
Copied: packages/trunk/game-package/doom-wad (from rev 6066,
packages/branches/game-package/support_doom1/doom-wad)
Modified: packages/trunk/game-package/doom2-wad/DEBIAN/control
===================================================================
--- packages/trunk/game-package/doom2-wad/DEBIAN/control 2008-03-15
14:22:15 UTC (rev 6066)
+++ packages/trunk/game-package/doom2-wad/DEBIAN/control 2008-03-15
14:24:26 UTC (rev 6067)
@@ -10,5 +10,5 @@
Description: IWAD from ID Software's DOOM 2 computer game
Doom requires both a doom-engine and a doom-wad to play. This package
contains the IWAD from ID Software's game "DOOM 2", and was
- generated using the "make-wad-package" program from the "doom-package"
+ generated using the "make-wad-package" program from the "game-package"
debian package.
Modified:
packages/trunk/game-package/doom2-wad/usr/share/applications/doom2-wad.desktop
===================================================================
---
packages/trunk/game-package/doom2-wad/usr/share/applications/doom2-wad.desktop
2008-03-15 14:22:15 UTC (rev 6066)
+++
packages/trunk/game-package/doom2-wad/usr/share/applications/doom2-wad.desktop
2008-03-15 14:24:26 UTC (rev 6067)
@@ -2,7 +2,7 @@
Name=Doom 2
GenericName=Doom 2: Hell on Earth
Comment=First Person Shooter Game
-Exec=doom -iwad /usr/share/games/doom-package/doom2.wad
+Exec=doom -iwad /usr/share/games/game-package/doom2.wad
Icon=doom2.xpm
Terminal=false
Type=Application
Modified:
packages/trunk/game-package/doom2-wad/usr/share/doc/doom2-wad/copyright
===================================================================
--- packages/trunk/game-package/doom2-wad/usr/share/doc/doom2-wad/copyright
2008-03-15 14:22:15 UTC (rev 6066)
+++ packages/trunk/game-package/doom2-wad/usr/share/doc/doom2-wad/copyright
2008-03-15 14:24:26 UTC (rev 6067)
@@ -1,7 +1,7 @@
-The doom2-wad package was generated using doom-package.
+The doom2-wad package was generated using game-package.
Copyright (C) 2006 Jon Dowland <[EMAIL PROTECTED]>.
-The file "/usr/share/games/doom-package/doom2.wad", if
+The file "/usr/share/games/game-package/doom2.wad", if
present, is a user-supplied file that is not covered by the
copyright or licence of this package. For example, the
original Doom 2 data is copyright (c) 1999 by id Software,
Copied: packages/trunk/game-package/supported/doom (from rev 6066,
packages/branches/game-package/support_doom1/supported/doom)
===================================================================
--- packages/trunk/game-package/supported/doom (rev 0)
+++ packages/trunk/game-package/supported/doom 2008-03-15 14:24:26 UTC (rev
6067)
@@ -0,0 +1,62 @@
+# vim: set ft=sh:
+
+SHORTNAME=doom
+LONGNAME="Doom"
+
+DEBBASE="doom-wad_7_all.deb"
+
+doom2_usage() {
+ echo "doom game arguments:" >&2
+ printf "\twadfile - path to a doom.wad\n"
+}
+
+verify_args() {
+ if [ $# -ne 1 ]; then
+ echo "error: no wadfile specified" >&2
+ usage >&2
+ doom2_usage >&2
+ exit 1
+ fi
+}
+checksum() {
+ CHECKSUM=`md5sum "$1" | cut -d' ' -f1`
+ debug "checksum = $CHECKSUM"
+ echo $CHECKSUM
+}
+
+check_for_v19() {
+ case "$MD5SUM" in
+ "c4fe9fd920207691a9f493668e0a2083")
+ debug "doom.wad is a v1.9 IWAD"
+ ;;
+ *)
+ warn "the doom.wad file is not version 1.9"
+ warn "(or has been modified)"
+ warn "you may have some problems with PWADs and demos"
+ ;;
+ esac
+
+}
+
+DATADIR="/usr/share/games/game-package"
+
+if [ -f "$PWD/$DEBBASE" ]; then
+ DEB="$PWD/$DEBBASE"
+else
+ DEB="$DATADIR/$DEBBASE"
+fi
+
+go() {
+ verify_args $*
+ WADFILE="$1"
+ MD5SUM=`checksum "$WADFILE"`
+ check_for_v19
+
+ DEST=`echo $DATADIR | sed 's,^/,,'`
+
+ if [ "" = "$OUTFILE" ]; then
+ OUTFILE=`mktemp -t game-package.doom.XXXXXX`
+ fi
+ cp -p "$DEB" "$OUTFILE"
+ slipstream "$OUTFILE" "$DEST" "$WADFILE"
+}
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
