[SCM] osmosis branch, master, updated. debian/0.31.2-2-56-g37f6a9a

[David Paleino]

The following commit has been merged in the master branch:
commit 6f53fa7b21eb5196554a3c03018ddae1a41623d8
Merge: 8557ecb12d6a1bb8a1eb47199f01c2efa88f38a2 0bbd28dc35026d86e1c81d48aff4918300397b56
Author: David Paleino <dapal at debian.org>
Date:   Wed Sep 28 10:08:22 2011 +0200

    Merge commit 'upstream/0.39+ds1'

diff --combined package/bin/osmosis
index aaa4394,2ef3ef2..d377089
--- a/package/bin/osmosis
+++ b/package/bin/osmosis
@@@ -18,6 -18,25 +18,6 @@@ if [ -z "$JAVACMD" ] ; the
    JAVACMD=java
  fi
  
 -## resolve links - $0 may be a link to application
 -PRG="$0"
 -
 -# if started without absolute path, but from PATH environment
 -if [ ! -s "$PRG" ] ; then
 -    PRG=`which $PRG`
 -fi
 -
 -# need this for relative symlinks
 -while [ -h "$PRG" ] ; do
 -  ls=`ls -ld "$PRG"`
 -  link=`expr "$ls" : '.*-> \(.*\)$'`
 -  if expr "$link" : '/.*' > /dev/null; then
 -    PRG="$link"
 -  else
 -    PRG="`dirname "$PRG"`/$link"
 -  fi
 -done
 -
  if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then
  cat <<EOF
  osmosis
@@@ -70,6 -89,6 +70,6 @@@ cd "$saveddir
  MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
  
  MAINCLASS=org.codehaus.classworlds.Launcher
- EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf  $MAINCLASS $OSMOSIS_OPTIONS $@"
+ EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf  $MAINCLASS $OSMOSIS_OPTIONS"
  
- exec $EXEC
+ exec $EXEC "$@"

-- 
Osmosis, an OSM data processor