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

[Jon Dowland]

The following commit has been merged in the rott branch:
commit f1c44cd7bc420857436c0a063fc912d2c4110ec0
Merge: 0f70a9482a3e0d36da0de9d318259d8766a1c3f8 2c47fc8f2055e443713db76ccb4d97fb298d8319
Author: Jon Dowland <jmtd at debian.org>
Date:   Wed Feb 3 15:17:59 2010 +0000

    Merge branch 'master' into rott
    
    Conflicts:
    	debian/TODO
    	debian/control

diff --combined debian/TODO
index 24d2527,0f55e52..c4dc172
--- a/debian/TODO
+++ b/debian/TODO
@@@ -3,9 -3,4 +3,5 @@@ TODO
  	* do away with ./Makefile and build entirely from debian/rules
  		* reconsider: why do this?
  	* re-add quake3 support (currently in a branch)
- 	* default to su -c (sudo might not be configured)
- 		* provide configurable methods for elevating privs
- 
- rott support:
- 
 -	* provide configurable methods for elevating privs
 +	* install VENDOR.DOC to /u/s/d/rott-data/copyright.gz
++    * provide configurable methods for elevating privs
diff --combined debian/control
index 12aafa4,c5be8d8..0eff40b
--- a/debian/control
+++ b/debian/control
@@@ -9,8 -9,8 +9,7 @@@ Standards-Version: 3.8.
  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, sudo, unzip | p7zip-full, ${misc:Depends}
 -Depends: fakeroot, ${misc:Depends}
++Depends: fakeroot, unzip | p7zip-full, ${misc:Depends}
  Conflicts: doom-package
  Replaces: doom-package
  Provides: doom-package
diff --combined lib/game-data-packager-shared
index 892ae58,616b6f6..b5e8c25
--- a/lib/game-data-packager-shared
+++ b/lib/game-data-packager-shared
@@@ -164,7 -164,8 +164,8 @@@ slipstream_cleanup() 
  
  install_deb() {
  	DEB="$1"
- 	sudo dpkg -i "$DEB"
+     echo "using su(1) to obtain root privileges and install the package"
+ 	su -c "dpkg -i \"$DEB\""
  }
  
  unravel() {
@@@ -186,19 -187,3 +187,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