[SCM] Installer for game data files branch, rott, updated. 51df4fc19f1d363f4ea2c94e0370743025f34714

[Jon Dowland]

The following commit has been merged in the rott branch:
commit 51df4fc19f1d363f4ea2c94e0370743025f34714
Merge: e5d09412cc73bfbd31361d14e608d9eeeb302aed 37266375f4be29df3c6b53d2c35d1054f58a2eca
Author: Jon Dowland <jmtd at debian.org>
Date:   Sat Jan 8 11:35:09 2011 +0000

    Merge branch 'master' into rott

diff --combined Makefile
index f50824e,bd7270f..8a199b9
--- a/Makefile
+++ b/Makefile
@@@ -9,7 -9,7 +9,8 @@@ default: $(DIRS
  		LONG="Final Doom: TNT: Evilution" VERSION=$(VERSION)
  	make -f doom-common.mk IWAD=plutonia \
  		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
+ 	make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION)
 +	make -f rott.mk VERSION=$(VERSION)
  
  $(DIRS):
  	mkdir -p $@
@@@ -22,7 -22,7 +23,8 @@@ clean
  		LONG="Final Doom: TNT: Evilution" VERSION=$(VERSION) clean
  	make -f doom-common.mk IWAD=plutonia \
  		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
  	for d in $(DIRS); do [ ! -d "$$d" ]  || rmdir "$$d"; done
  
  .PHONY: default clean
diff --combined debian/TODO
index 5fdbadf,f271187..190190e
--- a/debian/TODO
+++ b/debian/TODO
@@@ -3,4 -3,11 +3,11 @@@ TODO
  	* do away with ./Makefile and build entirely from debian/rules
  		* reconsider: why do this?
  	* re-add quake3 support (currently in a branch)
 +    * provide configurable methods for elevating privs
+ 	* provide configurable methods for elevating privs
+ 
+ 	nicer -i behaviour
+ 		support (somehow) installing a generated .deb and throwing
+ 		it away (current behaviour is now, generate and store in	
+ 		$(pwd) if otherwise unspecified; impossible not to preserve
+ 		generated file)
 -
diff --combined debian/control
index edb2af7,c2093e7..36b3050
--- a/debian/control
+++ b/debian/control
@@@ -2,15 -2,15 +2,15 @@@ Source: game-data-package
  Section: contrib/games
  Priority: optional
  Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
- Uploaders: Jon Dowland <jmtd at debian.org>
+ Uploaders: Jon Dowland <jmtd at debian.org>, Simon McVittie <smcv at debian.org>
  Build-Depends: debhelper (>> 7.0.0), fakeroot, m4
  DM-Upload-Allowed: yes
- Standards-Version: 3.8.3
+ Standards-Version: 3.9.1
  Vcs-Git: git://git.debian.org/git/pkg-games/game-data-packager
  Vcs-Browser: http://git.debian.org/?p=pkg-games/game-data-packager.git
  
  Package: game-data-packager
 -Depends: fakeroot, ${misc:Depends}
 +Depends: fakeroot, unzip | p7zip-full, ${misc:Depends}
  Conflicts: doom-package
  Replaces: doom-package
  Provides: doom-package
@@@ -26,4 -26,4 +26,4 @@@ Description: Installer for game data fi
   commercial game data).
   .
   At the moment, game-data-packager has support for building debs
-  for Doom games (Doom, Doom 2 and Final Doom).
+  for Doom games (Doom, Doom 2 and Final Doom), and Quake III Arena.
diff --combined debian/game-data-packager.install
index 6f9f278,12f69b1..e793bfd
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@@ -1,15 -1,14 +1,17 @@@
  lib/game-data-packager-shared usr/lib/game-data-packager
  lib/doom-common               usr/lib/game-data-packager
 +lib/rott-mirrors              usr/lib/game-data-packager
  game-data-packager            usr/games
  supported/doom                usr/share/games/game-data-packager/supported
  supported/doom2               usr/share/games/game-data-packager/supported
+ supported/quake3              usr/share/games/game-data-packager/supported
  supported/tnt                 usr/share/games/game-data-packager/supported
  supported/plutonia            usr/share/games/game-data-packager/supported
 +supported/rott                usr/share/games/game-data-packager/supported
  etc/game-data-packager.conf   etc
+ out/quake3-data_*_all.deb     usr/share/games/game-data-packager
  out/doom-wad_*_all.deb        usr/share/games/game-data-packager
  out/doom2-wad_*_all.deb       usr/share/games/game-data-packager
  out/tnt-wad_*_all.deb         usr/share/games/game-data-packager
  out/plutonia-wad_*_all.deb    usr/share/games/game-data-packager
 +out/rott-data_*_all.deb       usr/share/games/game-data-packager
diff --combined lib/game-data-packager-shared
index bbfc8a5,15cdcd3..f20781e
--- a/lib/game-data-packager-shared
+++ b/lib/game-data-packager-shared
@@@ -94,7 -94,14 +94,14 @@@ slipstream() 
  	slipstream_unpack "$DEB"
  
  	while [ "$#" -gt 0 ]; do
- 		slipstream_file "$1" "$RELPATH"
+ 		file="$1"
+ 		destpath="$RELPATH"
+ 		if [ "x${RELPATH%/}" != "x${RELPATH}" ]; then
+ 			# RELPATH ends with /; append the basename of the
+ 			# file (e.g. pak0.pk3)
+ 			destpath="${RELPATH}${file##*/}"
+ 		fi
+ 		slipstream_file "$file" "$destpath"
  		shift
  	done
  
@@@ -188,19 -195,3 +195,19 @@@ els
      GAME_PACKAGE_VERSION=`dpkg-query --showformat='${Version}\n' \
          --show game-data-packager`
  fi
 +
 +gdp_unzip() {
 +    zipfile="$1"
 +    shift
 +    if which 7za >/dev/null; then
 +        debug "using 7za"
 +        7za e -y "$zipfile" "$@" >/dev/null
 +    fi
 +    if which 7z >/dev/null; then
 +        debug "using 7z"
 +        7z e -y "$zipfile" "$@" >/dev/null
 +    else
 +        debug "using unzip"
 +        unzip -qqo "$zipfile" "$@"
 +    fi
 +}

-- 
Installer for game data files