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

[David Paleino]

The following commit has been merged in the master branch:
commit bc8e601d4752d5e54aa9337bda04c8a7de9d43d1
Author: David Paleino <dapal at debian.org>
Date:   Wed Nov 2 21:53:57 2011 +0100

    Fix plexus config file to correctly point to jars (Closes: #647452)

diff --git a/debian/changelog b/debian/changelog
index 3c5c7f8..5b27a20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.39+ds1-6) UNRELEASED; urgency=low
+
+  * Fix plexus config file to correctly point to jars (Closes: #647452)
+
+ -- David Paleino <dapal at debian.org>  Wed, 02 Nov 2011 21:53:23 +0100
+
 osmosis (0.39+ds1-5) unstable; urgency=low
 
   * Add dependency to libcommons-pool-java (Closes: #644712)
diff --git a/debian/control b/debian/control
index cac5a52..294cdef 100644
--- a/debian/control
+++ b/debian/control
@@ -48,8 +48,10 @@ Depends:
  , libpostgis-java
  , libpg-java
  , libspring-beans-java
+ , libspring-context-java
+ , libspring-core-java
  , libspring-jdbc-java
- , libspring-tx-2.5-java
+ , libspring-transaction-java
  , libwoodstox-java
  , libplexus-classworlds-java
  , libprotobuf-java
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index 0588ffa..3cae336 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -21,10 +21,10 @@ Forwarded: not-needed
 +load /usr/share/java/mysql-connector-java.jar
 +load /usr/share/java/postgis.jar
 +load /usr/share/java/postgresql.jar
-+load /usr/share/java/spring-beans.jar
-+load /usr/share/java/spring-core.jar
-+load /usr/share/java/spring-jdbc.jar
-+load /usr/share/java/spring-tx.jar
++load /usr/share/java/spring3-beans.jar
++load /usr/share/java/spring3-core.jar
++load /usr/share/java/spring3-jdbc.jar
++load /usr/share/java/spring3-transaction.jar
 +load /usr/share/java/wstx-lgpl.jar
 +load /usr/share/java/batik-ext.jar
 +load /usr/share/java/protobuf.jar

-- 
Osmosis, an OSM data processor