[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-41-g3203194

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 320319424e04f6bdcb33abc8d47782769ccded7a
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Apr 22 20:35:37 2012 -0400

    0010-fix-ember-script-args.patch: fix argument handling in script

diff --git a/debian/changelog b/debian/changelog
index fca9ae3..f468d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ ember (0.6.2-1) unstable; urgency=low
   * 0008-replace-fastdeletegate-with-boost.patch: replaced FastDelegate
     - used GPL-compatible boost::function instead
   * 0009-spelling-bach.patch: fix spelling mistake
+  * 0010-fix-ember-script-args.patch: fix argument handling in script
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 22 Apr 2012 20:12:45 -0400
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sun, 22 Apr 2012 20:35:04 -0400
 
 ember (0.5.7-1.1) unstable; urgency=high
 
diff --git a/debian/patches/0010-fix-ember-script-args.patch b/debian/patches/0010-fix-ember-script-args.patch
new file mode 100644
index 0000000..ec37cd2
--- /dev/null
+++ b/debian/patches/0010-fix-ember-script-args.patch
@@ -0,0 +1,54 @@
+Description: properly parse multiple arguments in wrapper shell script.
+Author: Stephen M. Webb <stephen.webB at bregmasoft.ca>
+
+--- a/ember.in
++++ b/ember.in
+@@ -1,9 +1,7 @@
+-#!/bin/sh
+-
+-bindir="$( cd -P "$( dirname "$0" )" && pwd )"
+-prefix="$( cd -P "$( dirname "$0" )/.." && pwd )"
+-export LD_LIBRARY_PATH=$prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
++#!/bin/sh -eu
+ 
++: ${bindir:="$( cd -P "$( dirname "$0" )" && pwd )"}
++: ${prefix:="$( cd -P "$( dirname "$0" )/.." && pwd )"}
+ 
+ homedata="$HOME/.ember"
+ 
+@@ -11,20 +9,26 @@
+ 
+ echo "According to my calculations Ember should be installed in $prefix"
+ 
+-case "$1" in
+---home)
+-  shift
+-  homedata="$@"
+-  ;;
+---debug)
++while [ $# -gt 0 ]; do
++  case "$1" in
++  --home)
++    shift
++    homedata="$1"
++    ;;
++  --debug)
++    debugging=1
++    ;;
++  --*)
++    echo "usage: $0 [ --home configdir ] [ --debug ]" >&2
++    exit 1
++  esac
+   shift
+-  debugging=1
+-  ;;
+-esac
++done
+ 
+ # Rely on built-in paths for installed binaries.
+ if [ "$prefix" != "@prefix@" ]; then
+   prefix_arg="--prefix $prefix"
++  export LD_LIBRARY_PATH=$prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ else
+   prefix_arg=
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 184e256..73a9e06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-revert-libwfut-version.patch
 0008-replace-fastdeletegate-with-boost.patch
 0009-spelling-bach.patch
+0010-fix-ember-script-args.patch

-- 
WorldForge 3D client