[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-6-17-g5bf3caa

[David Paleino]

The following commit has been merged in the master branch:
commit 43a89f9abaf4bd3742c3fd127b232140f0a8b923
Author: David Paleino <dapal at debian.org>
Date:   Fri Dec 30 00:25:22 2011 +0100

    Add dependencies to libxerces2-java

diff --git a/debian/changelog b/debian/changelog
index faffc42..89f2297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ osmosis (0.40.1+ds1-1) UNRELEASED; urgency=low
     - added 04-fix_dependencies_versions.patch and
       05-workaround_missing_junit4.10.patch
   * Fix links to protobuf's jar (Closes: #650617, #652754)
+  * Add dependencies to libxerces2-java
 
- -- David Paleino <dapal at debian.org>  Thu, 29 Dec 2011 21:31:34 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 30 Dec 2011 00:25:07 +0100
 
 osmosis (0.39+ds1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 294cdef..88b8fb1 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Build-Depends:
  , libprotobuf-java
  , libosmpbf-java
  , libplexus-classworlds-java
+ , libxerces2-java
  , checkstyle
  , ivy
  , junit4
@@ -58,6 +59,7 @@ Depends:
  , libosmpbf-java
  , libbatik-java
  , libcommons-pool-java
+ , libxerces2-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/04-fix_dependencies_versions.patch b/debian/patches/04-fix_dependencies_versions.patch
index 4925979..39a669f 100644
--- a/debian/patches/04-fix_dependencies_versions.patch
+++ b/debian/patches/04-fix_dependencies_versions.patch
@@ -5,8 +5,8 @@ Origin: vendor
 Forwarded: not-needed
 
 ---
- build-support/config/ant-build-common.properties |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ build-support/config/ant-build-common.properties |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 --- osmosis.orig/build-support/config/ant-build-common.properties
 +++ osmosis/build-support/config/ant-build-common.properties
@@ -36,4 +36,5 @@ Forwarded: not-needed
 -dependency.version.woodstox-core=4.1.2
 +dependency.version.woodstox-core=debian
  dependency.version.woodstox-stax2=3.1.1
- dependency.version.xerces=2.9.1
+-dependency.version.xerces=2.9.1
++dependency.version.xerces=debian

-- 
Osmosis, an OSM data processor