[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-2-2-g8ed0fe4

[David Paleino]

The following commit has been merged in the master branch:
commit 0c5d4b5c12e5aed7d6f1e918039eed32d7dfff05
Author: David Paleino <dapal at debian.org>
Date:   Thu Jan 19 12:26:10 2012 +0100

    Add missing Osmosis JARs to Plexus config (Closes: #656432)

diff --git a/debian/changelog b/debian/changelog
index 6ef7f3d..a439e16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.40.1+ds1-3) UNRELEASED; urgency=low
+
+  * Add missing Osmosis JARs to Plexus config (Closes: #656432)
+
+ -- David Paleino <dapal at debian.org>  Thu, 19 Jan 2012 12:25:37 +0100
+
 osmosis (0.40.1+ds1-2) unstable; urgency=low
 
   * Removing references to libwoodstox-java, which is not necessary to
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index f750d95..a7addc4 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,14 +3,12 @@ Subject: fix Plexus configuration with the right paths
 Forwarded: not-needed
 
 ---
- package/config/plexus.conf |   18 +++++++++++++++++--
+ package/config/plexus.conf |   18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
-Index: osmosis/package/config/plexus.conf
-===================================================================
---- osmosis.orig/package/config/plexus.conf	2012-01-11 16:33:26.000000000 +0100
-+++ osmosis/package/config/plexus.conf	2012-01-11 16:46:53.000000000 +0100
-@@ -1,5 +1,18 @@
+--- osmosis.orig/package/config/plexus.conf
++++ osmosis/package/config/plexus.conf
+@@ -1,5 +1,19 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
  [osmosis.core]
@@ -31,3 +29,4 @@ Index: osmosis/package/config/plexus.conf
 +load /usr/share/java/protobuf-java.jar
 +load /usr/share/java/osmpbf.jar
 +load /usr/share/java/commons-pool.jar
++load /usr/share/osmosis/*.jar

-- 
Osmosis, an OSM data processor