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

[David Paleino]

The following commit has been merged in the master branch:
commit 4df7800f054ec86b596c727bb4d8ec5efc795626
Author: David Paleino <dapal at debian.org>
Date:   Thu Mar 8 08:23:37 2012 +0100

    Add DEP-3 header

diff --git a/debian/patches/06-no-woodstox.patch b/debian/patches/06-no-woodstox.patch
index a446bda..80656d3 100644
--- a/debian/patches/06-no-woodstox.patch
+++ b/debian/patches/06-no-woodstox.patch
@@ -1,7 +1,13 @@
-Index: osmosis/core/ivy.xml
-===================================================================
---- 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
+From: David Paleino <dapal at debian.org>
+Subject: fix missing woodstox dependency
+Forwarded: no
+
+---
+ core/ivy.xml |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- osmosis.orig/core/ivy.xml
++++ osmosis/core/ivy.xml
 @@ -25,10 +25,6 @@
      
      <dependencies>

-- 
Osmosis, an OSM data processor