[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-22-g1dd4cf2

[David Paleino]

The following commit has been merged in the master branch:
commit 1dd4cf283e0295ec258df637908ff596950ccdab
Author: David Paleino <dapal at debian.org>
Date:   Thu Apr 1 00:53:05 2010 +0200

    01-fix_launcher.patch added, correctly point to the right paths

diff --git a/debian/changelog b/debian/changelog
index 4636eaf..c08fd84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
   * debian/patches/:
     - 00-fix_build.patch added, fixes FTBFS because of missing file
       in upstream tarball
+    - 01-fix_launcher.patch added, correctly point to the right paths
   * debian/osmosis.1 statically generated, so to remove unneeded
     Build-Dependencies
   * debian/watch: use dversionmangle
@@ -27,7 +28,7 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
   * debian/*: updated my email address
   * debian/watch: updated to new upstream distribution location
 
- -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:50:27 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:52:46 +0200
 
 osmosis (0.31.2-2) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
new file mode 100644
index 0000000..c016813
--- /dev/null
+++ b/debian/patches/01-fix_launcher.patch
@@ -0,0 +1,30 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix launcher to correctly point to installed files
+Forwarded: not-needed
+
+---
+ bin/osmosis |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+--- osmosis.orig/bin/osmosis
++++ osmosis/bin/osmosis
+@@ -61,15 +61,13 @@ exit 1
+ fi
+ 
+ # make it fully qualified
+-saveddir=`pwd`
+-MYAPP_HOME=`dirname "$PRG"`/..
+-MYAPP_HOME=`cd "$MYAPP_HOME" && pwd`
+-cd "$saveddir"
++MYAPP_HOME="/usr/share/osmosis"
++LIBRARIES_HOME="/usr/share/java"
+ 
+ # 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
+ 
+ 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 $EXEC
diff --git a/debian/patches/series b/debian/patches/series
index b75ec23..2b6adce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-fix_build.patch
+01-fix_launcher.patch

-- 
Osmosis, an OSM data processor