[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-3-1-gd5fb537

[David Paleino]

The following commit has been merged in the master branch:
commit d5fb537e106068e104446688cd89390680060f38
Author: David Paleino <dapal at debian.org>
Date:   Sat Oct 1 21:29:34 2011 +0200

    01-fix_launcher.patch fixed: osmosis.jar doesn't exist anymore.

diff --git a/debian/changelog b/debian/changelog
index 149f70f..52b2a1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.39+ds1-4) UNRELEASED; urgency=low
+
+  * 01-fix_launcher.patch fixed: osmosis.jar doesn't exist anymore.
+
+ -- David Paleino <dapal at debian.org>  Sat, 01 Oct 2011 21:29:22 +0200
+
 osmosis (0.39+ds1-3) unstable; urgency=low
 
   * Fix plexus config file not to load duplicate jars, by hardcoding
diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index a7780c9..63e9827 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -21,7 +21,7 @@ Forwarded: not-needed
  
  # Build up the classpath of required jar files via classworlds launcher.
 -MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar
-+MYAPP_CLASSPATH=$MYAPP_HOME/osmosis.jar:$LIBRARIES_HOME/plexus-classworlds.jar
++MYAPP_CLASSPATH=$LIBRARIES_HOME/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"

-- 
Osmosis, an OSM data processor