[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 4cc667d07a8332f13311f43f904dee1479334a25
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Jun 15 12:11:25 2012 +0200

    Set versions for a few dependencies to "debian".

diff --git a/debian/patches/04-fix_dependencies_versions.patch b/debian/patches/04-fix_dependencies_versions.patch
index 4f8a8c2..7ae2bde 100644
--- a/debian/patches/04-fix_dependencies_versions.patch
+++ b/debian/patches/04-fix_dependencies_versions.patch
@@ -10,16 +10,18 @@ Forwarded: not-needed
 
 Index: osmosis/build-support/config/ant-build-common.properties
 ===================================================================
---- 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
+--- osmosis.orig/build-support/config/ant-build-common.properties	2012-06-15 12:13:49.000000000 +0200
++++ osmosis/build-support/config/ant-build-common.properties	2012-06-15 12:15:52.000000000 +0200
 @@ -2,19 +2,18 @@
  
  # 3rd Party Library Versions
  dependency.version.checkstyle=5.4
 -dependency.version.classworlds=2.4
+-dependency.version.commons-codec=1.5
+-dependency.version.commons-compress=1.2
 +dependency.version.classworlds=debian
- dependency.version.commons-codec=1.5
- dependency.version.commons-compress=1.2
++dependency.version.commons-codec=debian
++dependency.version.commons-compress=debian
  dependency.version.commons-dbcp=1.4
 -dependency.version.osmpbf=1.1.1-754a33af
 +dependency.version.osmpbf=
@@ -29,11 +31,12 @@ Index: osmosis/build-support/config/ant-build-common.properties
 -dependency.version.mysql=5.1.18
 -dependency.version.postgis=1.3.3
 -dependency.version.postgresql=9.0-801.jdbc4
+-dependency.version.protobuf=2.4.1
 +dependency.version.junit=4.x
 +dependency.version.mysql=debian
 +dependency.version.postgis=
 +dependency.version.postgresql=
- dependency.version.protobuf=2.4.1
++dependency.version.protobuf=debian
  dependency.version.spring=3.0.6.RELEASE
 -dependency.version.woodstox-core=4.1.2
  dependency.version.woodstox-stax2=3.1.1
diff --git a/debian/patches/06-no-woodstox.patch b/debian/patches/06-no-woodstox.patch
index 80656d3..f562c72 100644
--- a/debian/patches/06-no-woodstox.patch
+++ b/debian/patches/06-no-woodstox.patch
@@ -6,8 +6,10 @@ Forwarded: no
  core/ivy.xml |    4 ----
  1 file changed, 4 deletions(-)
 
---- osmosis.orig/core/ivy.xml
-+++ osmosis/core/ivy.xml
+Index: osmosis/core/ivy.xml
+===================================================================
+--- osmosis.orig/core/ivy.xml	2012-06-15 12:01:32.000000000 +0200
++++ osmosis/core/ivy.xml	2012-06-15 12:08:29.000000000 +0200
 @@ -25,10 +25,6 @@
      
      <dependencies>

-- 
Osmosis, an OSM data processor