[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-4-4-g098806f

[David Paleino]

The following commit has been merged in the master branch:
commit aa721901a5c3eda2a04233fba12693ab67fa9d70
Author: David Paleino <dapal at debian.org>
Date:   Sun Oct 9 20:09:37 2011 +0200

    Split EXEC on multiple lines, for easier reading

diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index 63e9827..e36f296 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -3,12 +3,12 @@ Subject: fix launcher to correctly point to installed files
 Forwarded: not-needed
 
 ---
- package/bin/osmosis |   10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
+ package/bin/osmosis |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
 --- osmosis.orig/package/bin/osmosis
 +++ osmosis/package/bin/osmosis
-@@ -80,15 +80,13 @@ exit 1
+@@ -80,15 +80,16 @@ exit 1
  fi
  
  # make it fully qualified
@@ -25,6 +25,9 @@ Forwarded: not-needed
  
  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=/etc/osmosis/plexus.conf  $MAINCLASS $OSMOSIS_OPTIONS"
++EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH"
++EXEC="$EXEC -Dapp.home=$MYAPP_HOME"
++EXEC="$EXEC -Dclassworlds.conf=/etc/osmosis/plexus.conf"
++EXEC="$EXEC $MAINCLASS $OSMOSIS_OPTIONS"
  
  exec $EXEC "$@"

-- 
Osmosis, an OSM data processor