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

[David Paleino]

The following commit has been merged in the master branch:
commit 93abd37e334c9b50e0a7a03dd2eb29849585d7d0
Author: David Paleino <dapal at debian.org>
Date:   Thu Sep 29 11:44:04 2011 +0200

    Fix plexus config file not to load duplicate jars, by hardcoding osmosis' version number in it.

diff --git a/debian/changelog b/debian/changelog
index d401b5a..91bb6ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osmosis (0.39+ds1-3) UNRELEASED; urgency=low
+
+  * Fix plexus config file not to load duplicate jars, by hardcoding
+    osmosis' version number in it.
+
+ -- David Paleino <dapal at debian.org>  Thu, 29 Sep 2011 11:43:43 +0200
+
 osmosis (0.39+ds1-2) unstable; urgency=low
 
   * Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539)
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index dfaef86..ceece6a 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -29,4 +29,4 @@ Forwarded: not-needed
 +load /usr/share/java/batik-ext.jar
 +load /usr/share/java/protobuf.jar
 +load /usr/share/java/osmpbf.jar
-+load /usr/share/osmosis/*.jar
++load /usr/share/osmosis/*-0.39.jar

-- 
Osmosis, an OSM data processor