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

[David Paleino]

The following commit has been merged in the master branch:
commit 87d4e0dbae9fa496d74a57f4da671593da0fc249
Author: David Paleino <dapal at debian.org>
Date:   Thu Apr 1 01:02:17 2010 +0200

    Complete plexus.conf with missing jars

diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index b838de7..4b3f16d 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,17 +3,27 @@ Subject: fix Plexus configuration with the right paths
 Forwarded: not-needed
 
 ---
- config/plexus.conf |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ config/plexus.conf |   15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
 
 --- osmosis.orig/config/plexus.conf
 +++ osmosis/config/plexus.conf
-@@ -1,6 +1,5 @@
+@@ -1,6 +1,15 @@
  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/java/jpf.jar
++load /usr/share/java/commons-compress.jar
++load /usr/share/java/commons-codec.jar
++load /usr/share/java/commons-dbcp.jar
++load /usr/share/java/mysql.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-jdbc.jar
++load /usr/share/java/spring-tx.jar
++load /usr/share/java/wstx-lgpl.jar
 +load /usr/share/osmosis/osmosis.jar

-- 
Osmosis, an OSM data processor