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

[David Paleino]

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

    02-fix_plexus.patch added, fix Plexus configuration with the right paths

diff --git a/debian/changelog b/debian/changelog
index c08fd84..996f27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ osmosis (0.34+ds1-1) UNRELEASED; urgency=low
     - 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
+    - 02-fix_plexus.patch added, fix Plexus configuration with the
+      right paths
   * debian/osmosis.1 statically generated, so to remove unneeded
     Build-Dependencies
   * debian/watch: use dversionmangle
@@ -28,7 +30,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:52:46 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 01 Apr 2010 00:54:28 +0200
 
 osmosis (0.31.2-2) unstable; urgency=low
 
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
new file mode 100644
index 0000000..b838de7
--- /dev/null
+++ b/debian/patches/02-fix_plexus.patch
@@ -0,0 +1,19 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix Plexus configuration with the right paths
+Forwarded: not-needed
+
+---
+ config/plexus.conf |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- osmosis.orig/config/plexus.conf
++++ osmosis/config/plexus.conf
+@@ -1,6 +1,5 @@
+ main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
+ 
+ [osmosis.core]
+-load ${app.home}/lib/*.jar
+-load ${app.home}/lib/default/*.jar
+-load ${app.home}/osmosis.jar
++#load /usr/share/java/*.jar
++load /usr/share/osmosis/osmosis.jar
diff --git a/debian/patches/series b/debian/patches/series
index 2b6adce..a01c5ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00-fix_build.patch
 01-fix_launcher.patch
+02-fix_plexus.patch

-- 
Osmosis, an OSM data processor