[SCM] osmosis branch, master, updated. debian/0.31.2-2-53-g8557ecb

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 8557ecb12d6a1bb8a1eb47199f01c2efa88f38a2
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Aug 14 22:45:45 2011 +0200

    Do not fail on error when cleaning.

diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
index e7d5efb..bdcc178 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -11,8 +11,8 @@
 
 Index: osmosis/apidb/build.xml
 ===================================================================
---- osmosis.orig/apidb/build.xml	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/apidb/build.xml	2011-01-31 01:05:09.000000000 +0100
+--- osmosis.orig/apidb/build.xml	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/apidb/build.xml	2011-08-14 22:45:09.000000000 +0200
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Apidb" default="all" basedir=".">
@@ -24,8 +24,8 @@ Index: osmosis/apidb/build.xml
  	<import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/build-support/script/build-ivy-base.xml
 ===================================================================
---- osmosis.orig/build-support/script/build-ivy-base.xml	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml	2011-01-31 01:05:09.000000000 +0100
+--- osmosis.orig/build-support/script/build-ivy-base.xml	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/build-support/script/build-ivy-base.xml	2011-08-14 22:45:09.000000000 +0200
 @@ -9,6 +9,7 @@
  	<!-- Include common build components. -->
  	<property name="build-support.dir" location="../"/>
@@ -65,8 +65,8 @@ Index: osmosis/build-support/script/build-ivy-base.xml
  		<ivy:info />
 Index: osmosis/build-support/script/build-java.xml
 ===================================================================
---- osmosis.orig/build-support/script/build-java.xml	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml	2011-01-31 01:05:09.000000000 +0100
+--- osmosis.orig/build-support/script/build-java.xml	2011-08-14 22:44:33.000000000 +0200
++++ osmosis/build-support/script/build-java.xml	2011-08-14 22:45:31.000000000 +0200
 @@ -109,12 +109,12 @@
  	</target>
  	
@@ -94,10 +94,19 @@ Index: osmosis/build-support/script/build-java.xml
  			<batchtest todir="report/test">
  				<fileset dir="build/test">
  					<include name="**/*Test*.class"/>
+@@ -148,7 +148,7 @@
+ 		<!-- Delete the doc/api directory tree. -->
+ 		<delete dir="doc/api"/>
+ 		<!-- Delete the generated test data files. -->
+-		<delete>
++		<delete failonerror="false">
+ 			<fileset dir="test/data/input">
+ 				<include name="**/*"/>
+ 			</fileset>
 Index: osmosis/extract/build.xml
 ===================================================================
---- osmosis.orig/extract/build.xml	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/extract/build.xml	2011-01-31 01:05:09.000000000 +0100
+--- osmosis.orig/extract/build.xml	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/extract/build.xml	2011-08-14 22:45:09.000000000 +0200
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Extract" default="all" basedir=".">
@@ -109,8 +118,8 @@ Index: osmosis/extract/build.xml
  	<import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/pgsnapshot/build.xml
 ===================================================================
---- osmosis.orig/pgsnapshot/build.xml	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/pgsnapshot/build.xml	2011-01-31 01:05:09.000000000 +0100
+--- osmosis.orig/pgsnapshot/build.xml	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/pgsnapshot/build.xml	2011-08-14 22:45:09.000000000 +0200
 @@ -1,5 +1,7 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.PgSnapshot" default="all" basedir=".">
@@ -121,8 +130,8 @@ Index: osmosis/pgsnapshot/build.xml
  	<property name="build-support.dir" location="../build-support"/>
 Index: osmosis/build.xml
 ===================================================================
---- osmosis.orig/build.xml	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/build.xml	2011-01-31 01:05:09.000000000 +0100
+--- osmosis.orig/build.xml	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/build.xml	2011-08-14 22:45:09.000000000 +0200
 @@ -10,6 +10,7 @@
  			<fileset dir=".">
  				<include name="**/build.xml"/>
@@ -133,8 +142,8 @@ Index: osmosis/build.xml
  	</target>
 Index: osmosis/build-support/config/ant-build-common.properties
 ===================================================================
---- osmosis.orig/build-support/config/ant-build-common.properties	2011-01-25 18:42:15.000000000 +0100
-+++ osmosis/build-support/config/ant-build-common.properties	2011-01-31 01:06:15.000000000 +0100
+--- osmosis.orig/build-support/config/ant-build-common.properties	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/build-support/config/ant-build-common.properties	2011-08-14 22:45:10.000000000 +0200
 @@ -10,12 +10,12 @@
  dependency.version.osmosis-hstore=0.2
  dependency.version.ivy=2.1.0
@@ -152,8 +161,8 @@ Index: osmosis/build-support/config/ant-build-common.properties
  dependency.version.xerces=2.9.1
 Index: osmosis/core/ivy.xml
 ===================================================================
---- osmosis.orig/core/ivy.xml	2011-01-31 01:06:32.000000000 +0100
-+++ osmosis/core/ivy.xml	2011-01-31 01:06:48.000000000 +0100
+--- osmosis.orig/core/ivy.xml	2011-01-31 01:07:47.000000000 +0100
++++ osmosis/core/ivy.xml	2011-08-14 22:45:10.000000000 +0200
 @@ -25,7 +25,7 @@
      
      <dependencies>

-- 
Osmosis, an OSM data processor