[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-1-3-g002c76c

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 002c76ccccc6e841c195f4330c56060ada47e216
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Wed Jan 11 17:15:03 2012 +0100

    Missing xerces version.

diff --git a/debian/patches/04-fix_dependencies_versions.patch b/debian/patches/04-fix_dependencies_versions.patch
index 99707e9..4f8a8c2 100644
--- a/debian/patches/04-fix_dependencies_versions.patch
+++ b/debian/patches/04-fix_dependencies_versions.patch
@@ -10,9 +10,9 @@ Forwarded: not-needed
 
 Index: osmosis/build-support/config/ant-build-common.properties
 ===================================================================
---- osmosis.orig/build-support/config/ant-build-common.properties	2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/build-support/config/ant-build-common.properties	2012-01-11 16:46:53.000000000 +0100
-@@ -2,19 +2,17 @@
+--- osmosis.orig/build-support/config/ant-build-common.properties	2012-01-11 17:13:08.000000000 +0100
++++ osmosis/build-support/config/ant-build-common.properties	2012-01-11 17:17:54.000000000 +0100
+@@ -2,19 +2,18 @@
  
  # 3rd Party Library Versions
  dependency.version.checkstyle=5.4
@@ -38,3 +38,4 @@ Index: osmosis/build-support/config/ant-build-common.properties
 -dependency.version.woodstox-core=4.1.2
  dependency.version.woodstox-stax2=3.1.1
 -dependency.version.xerces=2.9.1
++dependency.version.xerces=debian
diff --git a/debian/patches/06-no-woodstox.patch b/debian/patches/06-no-woodstox.patch
index 72a7168..a446bda 100644
--- a/debian/patches/06-no-woodstox.patch
+++ b/debian/patches/06-no-woodstox.patch
@@ -1,7 +1,7 @@
 Index: osmosis/core/ivy.xml
 ===================================================================
---- osmosis.orig/core/ivy.xml	2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/core/ivy.xml	2012-01-11 16:51:16.000000000 +0100
+--- osmosis.orig/core/ivy.xml	2012-01-11 16:52:28.000000000 +0100
++++ osmosis/core/ivy.xml	2012-01-11 17:08:41.000000000 +0100
 @@ -25,10 +25,6 @@
      
      <dependencies>

-- 
Osmosis, an OSM data processor