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

[David Paleino]

The following commit has been merged in the master branch:
commit 856fefee61e6fa97ac4208f855e59688743b7465
Author: David Paleino <dapal at debian.org>
Date:   Sat Oct 8 16:54:27 2011 +0200

    Add dependency to libcommons-pool-java (Closes: #644712)

diff --git a/debian/changelog b/debian/changelog
index e37a3d2..d4d5d3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.39+ds1-5) UNRELEASED; urgency=low
+
+  * Add dependency to libcommons-pool-java (Closes: #644712)
+
+ -- David Paleino <dapal at debian.org>  Sat, 08 Oct 2011 16:53:10 +0200
+
 osmosis (0.39+ds1-4) unstable; urgency=low
 
   * 00-fix_build_system.patch updated: don't hardcode version number
diff --git a/debian/control b/debian/control
index 7fbdb68..cac5a52 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,7 @@ Depends:
  , libprotobuf-java
  , libosmpbf-java
  , libbatik-java
+ , libcommons-pool-java
  , ${misc:Depends}
 Description: Command line OpenStreetMap data processor
  Osmosis consists of a series of components that can be chained together
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index 28be9a5..0588ffa 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,12 +3,12 @@ Subject: fix Plexus configuration with the right paths
 Forwarded: not-needed
 
 ---
- package/config/plexus.conf |   18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
+ package/config/plexus.conf |   19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
 
 --- osmosis.orig/package/config/plexus.conf
 +++ osmosis/package/config/plexus.conf
-@@ -1,5 +1,19 @@
+@@ -1,5 +1,20 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
  [osmosis.core]
@@ -29,4 +29,5 @@ 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/java/commons-pool.jar
 +load ${app.home}/*.jar

-- 
Osmosis, an OSM data processor