[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 5968e97d302f471781c371cfe83db19e6f8d4b80
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Jan 11 19:04:56 2011 +0100

    New (so far incomplete) patch for the building system.

diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
new file mode 100644
index 0000000..4fe5116
--- /dev/null
+++ b/debian/patches/00-fix_build_system.patch
@@ -0,0 +1,84 @@
+---
+ apidb/build.xml                         |    2 ++
+ build-support/script/build-ivy-base.xml |    6 +++---
+ build-support/script/build-java.xml     |    2 +-
+ extract/build.xml                       |    2 ++
+ pgsnapshot/build.xml                    |    2 ++
+ 5 files changed, 10 insertions(+), 4 deletions(-)
+
+Index: osmosis/apidb/build.xml
+===================================================================
+--- osmosis.orig/apidb/build.xml	2011-01-11 19:01:22.000000000 +0100
++++ osmosis/apidb/build.xml	2011-01-10 21:01:20.000000000 +0100
+@@ -1,6 +1,8 @@
+ <?xml version="1.0" encoding="utf-8" ?>
+ <project name="Osmosis.Apidb" default="all" basedir=".">
+ 	
++	<property name="notests" value="true"/>
++
+ 	<!-- Include common java build. -->
+ 	<property name="build-support.dir" location="../build-support"/>
+ 	<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-11 19:01:12.000000000 +0100
++++ osmosis/build-support/script/build-ivy-base.xml	2011-01-10 19:45:30.000000000 +0100
+@@ -31,9 +31,9 @@
+ 
+ 	<target name="init-ivy" depends="init" description="Registers ivy with ant and initializes it." unless="ivy.initialized">
+ 		<!-- Determine if the ivy jar is already available. -->
+-		<available property="ivy.available" file="${ivy.jar.file}" />
++		<!--available property="ivy.available" file="${ivy.jar.file}" />-->
+ 		<!-- Download ivy.  This will only execute if the ivy.available property is not set. -->
+-		<antcall target="download-ivy" />
++		<!--<antcall target="download-ivy" />-->
+ 		<!--
+ 			Try to load ivy in case the user has not already
+ 			dropped it into ant's lib dir (note that the latter copy will always
+@@ -42,7 +42,7 @@
+ 			local lib dir.
+ 		-->
+ 		<path id="ivy.lib.path">
+-			<fileset dir="${ivy.jar.dir}" includes="*.jar" />
++			<file file="/usr/share/java/ivy.jar" />
+ 		</path>
+ 		<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
+ 			classpathref="ivy.lib.path" />
+Index: osmosis/build-support/script/build-java.xml
+===================================================================
+--- osmosis.orig/build-support/script/build-java.xml	2011-01-11 19:01:22.000000000 +0100
++++ osmosis/build-support/script/build-java.xml	2011-01-10 21:00:02.000000000 +0100
+@@ -109,7 +109,7 @@
+ 	</target>
+ 	
+ 	<!-- Runs all of the unit tests in the application. -->
+-	<target name="test" depends="build_test" description="Run automated test cases.">
++	<target name="test" depends="build_test" description="Run automated test cases." unless="notests">
+ 		<mkdir dir="report/test"/>
+ 		
+ 		<!-- Determine the location of the database authorisation file.  This can be overridden outside the build if necessary. -->
+Index: osmosis/extract/build.xml
+===================================================================
+--- osmosis.orig/extract/build.xml	2011-01-11 19:01:31.000000000 +0100
++++ osmosis/extract/build.xml	2011-01-10 21:04:25.000000000 +0100
+@@ -1,6 +1,8 @@
+ <?xml version="1.0" encoding="utf-8" ?>
+ <project name="Osmosis.Extract" default="all" basedir=".">
+ 	
++	<property name="notests" value="true"/>
++
+ 	<!-- Include common java build. -->
+ 	<property name="build-support.dir" location="../build-support"/>
+ 	<import file="${build-support.dir}/script/build-java.xml"/>
+Index: osmosis/pgsnapshot/build.xml
+===================================================================
+--- osmosis.orig/pgsnapshot/build.xml	2011-01-11 19:01:31.000000000 +0100
++++ osmosis/pgsnapshot/build.xml	2011-01-10 21:15:44.000000000 +0100
+@@ -1,5 +1,7 @@
+ <?xml version="1.0" encoding="utf-8" ?>
+ <project name="Osmosis.PgSnapshot" default="all" basedir=".">
++
++	<property name="notests" value="true"/>
+ 	
+ 	<!-- Include common java build. -->
+ 	<property name="build-support.dir" location="../build-support"/>
diff --git a/debian/patches/series b/debian/patches/series
index cfdb821..fe7ab08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+00-fix_build_system.patch
 01-fix_launcher.patch
 02-fix_plexus.patch

-- 
Osmosis, an OSM data processor