[SCM] Installer for game data files branch, rott, updated. 73257c7140028c5d8347f462bec38c6fb2748efd

[Jon Dowland]

The following commit has been merged in the rott branch:
commit 44b08fc8ce1b68a106393f6782f3c20980d98294
Merge: f1c44cd7bc420857436c0a063fc912d2c4110ec0 e30426b65b4c43d0d6a4ace731d6eba57e9c13f0
Author: Jon Dowland <jmtd at debian.org>
Date:   Tue Mar 23 15:09:07 2010 +0000

    Merge branch 'master' into rott
    
    Conflicts:
    	Makefile
    	debian/game-data-packager.install

diff --combined Makefile
index 33c5f71,edfd03c..f50824e
--- a/Makefile
+++ b/Makefile
@@@ -1,6 -1,7 +1,7 @@@
  VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2-)
+ DIRS := ./out ./build
  
- default:
+ default: $(DIRS)
  	make -f doom-common.mk IWAD=doom  LONG="Doom"   VERSION=$(VERSION)
  	make -f doom-common.mk IWAD=doom2 \
  		LONG="Doom 2: Hell on Earth" VERSION=$(VERSION)
@@@ -8,8 -9,10 +9,11 @@@
  		LONG="Final Doom: TNT: Evilution" VERSION=$(VERSION)
  	make -f doom-common.mk IWAD=plutonia \
  		LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
 +	make -f rott.mk VERSION=$(VERSION)
  
+ $(DIRS):
+ 	mkdir -p $@
+ 
  clean:
  	make -f doom-common.mk IWAD=doom  LONG="Doom"   VERSION=$(VERSION) clean
  	make -f doom-common.mk IWAD=doom2 \
@@@ -18,6 -21,6 +22,7 @@@
  		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 rott.mk VERSION=$(VERSION) clean
+ 	for d in $(DIRS); do [ ! -d "$$d" ]  || rmdir "$$d"; done
  
  .PHONY: default clean
diff --combined debian/game-data-packager.install
index fc5da30,de9d103..4757042
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@@ -5,10 -5,8 +5,10 @@@ supported/doom                usr/share
  supported/doom2               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
- doom-wad_*_all.deb            usr/share/games/game-data-packager
- doom2-wad_*_all.deb           usr/share/games/game-data-packager
- tnt-wad_*_all.deb             usr/share/games/game-data-packager
- plutonia-wad_*_all.deb        usr/share/games/game-data-packager
- rott-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 b5e8c25,8bce7c3..bbfc8a5
--- a/lib/game-data-packager-shared
+++ b/lib/game-data-packager-shared
@@@ -12,7 -12,8 +12,8 @@@ supported() 
  }
  options() {
  	echo "game-data-packager arguments:"
- 	echo "        -n            not do not install the generated package (requires -d)"
+ 	echo "        -i            install the generated package"
+ 	echo "        -n            do not install the generated package (requires -d, default)"
  	echo "        -d OUTDIR     write the generated .deb(s) to OUTDIR"
  }
  
@@@ -187,19 -188,3 +188,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