[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.31.2-2-64-g9fdd0a7

[David Paleino]

The following commit has been merged in the master branch:
commit 9fdd0a7746fc6ff953bd75340c742a796491b313
Author: David Paleino <dapal at debian.org>
Date:   Wed Sep 28 17:26:06 2011 +0200

    Add missing dependencies

diff --git a/debian/control b/debian/control
index c554ce1..3df9e69 100644
--- a/debian/control
+++ b/debian/control
@@ -47,16 +47,19 @@ Depends:
  , libmysql-java
  , libpostgis-java
  , libpg-java
- , libspring-beans-2.5-java
- , libspring-jdbc-2.5-java
+ , libspring-beans-java
+ , libspring-jdbc-java
  , libspring-tx-2.5-java
  , libwoodstox-java
  , libplexus-classworlds-java
+ , libprotobuf-java
+ , libosmpbf-java
+ , libbatik-java
  , ${misc:Depends}
 Description: Command line OpenStreetMap data processor
  Osmosis consists of a series of components that can be chained together
  in order to perform operations on an OpenStreetMap database or
- OpenStreetMap XML files. Such operations include:
+ OpenStreetMap XML or PBF files. Such operations include:
   * Generate and load dumps from and to a database.
   * Produce changesets comparing databases and files and applying
     them to other databases and files.
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index 5e3cef2..dfaef86 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,13 +3,12 @@ Subject: fix Plexus configuration with the right paths
 Forwarded: not-needed
 
 ---
- build-support/script/build-java.xml |    2 ++
- package/config/plexus.conf          |   14 ++++++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
+ package/config/plexus.conf |   18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
 
 --- osmosis.orig/package/config/plexus.conf
 +++ osmosis/package/config/plexus.conf
-@@ -1,5 +1,15 @@
+@@ -1,5 +1,19 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
  [osmosis.core]
@@ -19,11 +18,15 @@ Forwarded: not-needed
 +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/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/wstx-lgpl.jar
-+load /usr/share/osmosis/osmosis.jar
++load /usr/share/java/batik-ext.jar
++load /usr/share/java/protobuf.jar
++load /usr/share/java/osmpbf.jar
++load /usr/share/osmosis/*.jar

-- 
Osmosis, an OSM data processor