r9982 - in packages/trunk/game-data-packager: ! dirs' list truncated !
Jon Dowland
jmtd at alioth.debian.org
Mon Jul 6 19:26:51 UTC 2009
Author: jmtd
Date: 2009-07-06 19:26:50 +0000 (Mon, 06 Jul 2009)
New Revision: 9982
Added:
packages/trunk/game-data-packager/doom-common/DEBIAN/preinst.in
Removed:
packages/trunk/game-data-packager/doom-common/DEBIAN/postinst.in
packages/trunk/game-data-packager/doom-common/DEBIAN/prerm.in
Modified:
packages/trunk/game-data-packager/debian/changelog
packages/trunk/game-data-packager/doom-common.mk
packages/trunk/game-data-packager/doom-common/DEBIAN/control.in
packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in
packages/trunk/game-data-packager/lib/doom-common
Log:
train hacking: stop using alternatives
* We stop providing an alternative for the IWADS
* instead, we install directly into /usr/share/games/doom.
* Because older packages did install alternatives, we remove
them on upgrade in the preinst.
* As freedoom also installed alternatives (until recently), we
conflict with older versions
* also some minor .desktop fix-ups
Modified: packages/trunk/game-data-packager/debian/changelog
===================================================================
--- packages/trunk/game-data-packager/debian/changelog 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/debian/changelog 2009-07-06 19:26:50 UTC (rev 9982)
@@ -4,8 +4,13 @@
Thanks Frédéric Brière. Closes: #532817.
* shift '--' off the argument stack when encountered.
Thanks Frédéric Brière. Closes: #532812.
+ * don't bother registering alternatives anymore, install
+ IWADs direct to /usr/share/games/doom
+ * remove older alternatives in preinst upgrade
+ * conflict with freedoom < 0.6.4-5 which registers
+ alternatives for /usr/share/games/doom/doom2.wad
- -- Jon Dowland <jon at alcopop.org> Mon, 29 Jun 2009 21:54:47 +0100
+ -- Jon Dowland <jmtd at debian.org> Mon, 06 Jul 2009 17:34:32 +0100
game-data-packager (21) unstable; urgency=low
Modified: packages/trunk/game-data-packager/doom-common/DEBIAN/control.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/DEBIAN/control.in 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/doom-common/DEBIAN/control.in 2009-07-06 19:26:50 UTC (rev 9982)
@@ -5,6 +5,7 @@
Recommends: doom-engine
Provides: doom-wad
Installed-Size: 56
+Conflicts: freedoom (<< 0.6.4-5)
Version: VERSION
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Description: IWAD from ID Software's GAME computer game
Deleted: packages/trunk/game-data-packager/doom-common/DEBIAN/postinst.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/DEBIAN/postinst.in 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/doom-common/DEBIAN/postinst.in 2009-07-06 19:26:50 UTC (rev 9982)
@@ -1,22 +0,0 @@
-#!/bin/sh
-# postinst script for IWAD
-set -e
-
-case "$1" in
- configure)
- update-alternatives --install \
- /usr/share/games/doom/IWAD \
- IWAD /usr/share/games/game-data-packager/IWAD \
- 50
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "unsupported method $1" >&2
- exit 1
- ;;
-esac
-
-exit 0
Added: packages/trunk/game-data-packager/doom-common/DEBIAN/preinst.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/DEBIAN/preinst.in (rev 0)
+++ packages/trunk/game-data-packager/doom-common/DEBIAN/preinst.in 2009-07-06 19:26:50 UTC (rev 9982)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# preinst script for IWAD
+set -e
+
+case "$1" in
+ upgrade)
+ if dpkg --compare-versions "$2" lt "22"; then
+ update-alternatives --remove IWAD \
+ /usr/share/games/game-data-packager/IWAD
+ fi
+ ;;
+
+ install|abort-upgrade)
+ ;;
+
+ *)
+ echo "unsupported method $1" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Deleted: packages/trunk/game-data-packager/doom-common/DEBIAN/prerm.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/DEBIAN/prerm.in 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/doom-common/DEBIAN/prerm.in 2009-07-06 19:26:50 UTC (rev 9982)
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
- remove|deconfigure)
- update-alternatives --remove IWAD \
- /usr/share/games/game-data-packager/IWAD
-;;
-
- upgrade|failed-upgrade)
- ;;
-
- *)
- echo "unsupported method $1" >&2
- exit 1
- ;;
-esac
-
-exit 0
Modified: packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in
===================================================================
--- packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/doom-common/usr/share/applications/doom-common.desktop.in 2009-07-06 19:26:50 UTC (rev 9982)
@@ -1,9 +1,8 @@
[Desktop Entry]
-Name=GAME
-GenericName=LONG
-Comment=First Person Shooter Game
+Name=LONG
+GenericName=First Person Shooter Game
TryExec=doom
-Exec=doom -iwad /usr/share/games/game-data-packager/GAME.wad
+Exec=doom -iwad /usr/share/games/doom/GAME.wad
Icon=GAME.xpm
Terminal=false
Type=Application
Modified: packages/trunk/game-data-packager/doom-common.mk
===================================================================
--- packages/trunk/game-data-packager/doom-common.mk 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/doom-common.mk 2009-07-06 19:26:50 UTC (rev 9982)
@@ -1,9 +1,12 @@
-# "IWAD" and "IWAD" are passed in by the parent make; e.g.
-# $(IWAD) and $(IWAD); or $(IWAD)2 and $(IWAD)2.
+# "IWAD", "VERSION" and "LONG" are passed in by the parent make;
+# e.g.
+# IWAD=doom2, VERSION=22, LONG="Doom 2: Hell on Earth"
+# or
+# IWAD=doom, VERSION=22, LONG="Ultimate Doom"
$(IWAD)DEB=$(IWAD)-wad_$(VERSION)_all.deb
-$(IWAD)TARGETS := $(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/postinst $(IWAD)-wad/DEBIAN/prerm $(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
+$(IWAD)TARGETS := $(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
DIRS := \
$(IWAD)-wad/DEBIAN \
@@ -43,14 +46,10 @@
doom-common/usr/share/applications/doom-common.desktop.in \
> $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop
-$(IWAD)-wad/DEBIAN/prerm:
+$(IWAD)-wad/DEBIAN/preinst:
m4 -DIWAD=$(IWAD).wad \
- doom-common/DEBIAN/prerm.in > $(IWAD)-wad/DEBIAN/prerm
+ doom-common/DEBIAN/preinst.in > $(IWAD)-wad/DEBIAN/preinst
-$(IWAD)-wad/DEBIAN/postinst:
- m4 -DIWAD=$(IWAD).wad \
- doom-common/DEBIAN/postinst.in > $(IWAD)-wad/DEBIAN/postinst
-
$(IWAD)-wad/DEBIAN/control: doom-common/DEBIAN/control.in
m4 -DPACKAGE=$(IWAD)-wad -DGAME=$(IWAD) -DVERSION=$(VERSION) \
doom-common/DEBIAN/control.in > $(IWAD)-wad/DEBIAN/control
@@ -68,8 +67,7 @@
fixperms:
find $(IWAD)-wad -type f -print0 | xargs -r0 chmod 644
find $(IWAD)-wad -type d -print0 | xargs -r0 chmod 755
- chmod 755 $(IWAD)-wad/DEBIAN/postinst
- chmod 755 $(IWAD)-wad/DEBIAN/prerm
+ chmod 755 $(IWAD)-wad/DEBIAN/preinst
clean:
rm -f $($(IWAD)DEB) $($(IWAD)TARGETS)
Modified: packages/trunk/game-data-packager/lib/doom-common
===================================================================
--- packages/trunk/game-data-packager/lib/doom-common 2009-07-06 16:21:57 UTC (rev 9981)
+++ packages/trunk/game-data-packager/lib/doom-common 2009-07-06 19:26:50 UTC (rev 9982)
@@ -19,6 +19,7 @@
}
DATADIR="/usr/share/games/game-data-packager"
+WADDIR="/usr/share/games/doom"
if [ -f "$PWD/$DEBBASE" ]; then
DEB="$PWD/$DEBBASE"
@@ -34,7 +35,7 @@
debug "WADFILE=$WADFILE"
check_for_v19
- DEST=`echo $DATADIR | sed 's,^/,,'`/$SHORTNAME.wad
+ DEST=`echo $WADDIR | sed 's,^/,,'`/$SHORTNAME.wad
if [ "" = "$OUTDIR" ]; then
OUTFILE="$WORKDIR/out.deb"
More information about the Pkg-games-commits
mailing list