[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.31.2-2-70-g043a4cb

[David Paleino]

The following commit has been merged in the master branch:
commit 043a4cb37392830d314928bcefd98df9e0bbdbb9
Author: David Paleino <dapal at debian.org>
Date:   Wed Sep 28 18:08:23 2011 +0200

    Drop need for svnversion

diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
index e25a0e0..4a1a560 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -3,6 +3,7 @@
  apidb/ivy.xml                                    |    2 -
  areafilter/ivy.xml                               |    2 -
  build-support/config/ant-build-common.properties |   34 +++++++++++------------
+ build-support/script/build-init.xml              |    7 ----
  build-support/script/build-ivy-base.xml          |   11 +++----
  build-support/script/build-java.xml              |   26 ++++++++++-------
  build.xml                                        |    1 
@@ -19,7 +20,7 @@
  set/ivy.xml                                      |    2 -
  tagfilter/ivy.xml                                |    2 -
  xml/ivy.xml                                      |    2 -
- 20 files changed, 61 insertions(+), 51 deletions(-)
+ 21 files changed, 62 insertions(+), 57 deletions(-)
 
 --- osmosis.orig/apidb/build.xml
 +++ osmosis/apidb/build.xml
@@ -387,3 +388,19 @@
 +    	<dependency org="com.puppycrawl.tools" name="checkstyle" rev="${dependency.version.checkstyle}" conf="test->default"/>
      </dependencies>
  </ivy-module>
+--- osmosis.orig/build-support/script/build-init.xml
++++ osmosis/build-support/script/build-init.xml
+@@ -20,12 +20,7 @@
+ 
+ 		<!-- Determine the SVN revision number. -->
+ 		<property name="svn.basedir" location="${basedir}/.."/>
+-		<exec executable="svnversion" output="build/version.txt" failonerror="true">
+-			<arg value="-n"/>
+-			<arg value="${svn.basedir}"/>
+-		</exec>
+-		<replace file="build/version.txt" token=":" value="-"/>
+-		<loadfile property="svn.version" srcfile="build/version.txt"/>
++		<property name="svn.version" value="svn"/>
+ 
+ 		<!--
+ 			Build the project version.

-- 
Osmosis, an OSM data processor