The following commit has been merged in the master branch:
commit 8abcde6ad9f24469f8591b9ce349cd4aea43e2e3
Author: David Paleino <da...@debian.org>
Date: Thu Dec 1 18:37:06 2011 +0100
Refresh patches to apply to the new source
diff --git a/debian/changelog b/debian/changelog
index 684946a..95d4943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ osmosis (0.40+ds1-1) UNRELEASED; urgency=low
* New upstream version
* Fix debian/watch and debian/rules' get-orig-source to point to github
+ * Refresh patches to apply to the new source
- -- David Paleino <da...@debian.org> Thu, 01 Dec 2011 18:13:44 +0100
+ -- David Paleino <da...@debian.org> Thu, 01 Dec 2011 18:36:55 +0100
osmosis (0.39+ds1-6) unstable; urgency=low
diff --git a/debian/patches/00-fix_build_system.patch
b/debian/patches/00-fix_build_system.patch
index 979f055..a69fba9 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -4,28 +4,16 @@ Origin: vendor
Forwarded: not-needed
---
- apidb/build.xml | 2 +
- 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
- core/ivy.xml | 4 +-
- dataset/ivy.xml | 2 -
- extract/build.xml | 2 +
- extract/ivy.xml | 2 -
- hstore-jdbc/ivy.xml | 2 -
- pbf/ivy.xml | 4 +-
- pgsimple/ivy.xml | 4 +-
- pgsnapshot/build.xml | 2 +
- pgsnapshot/ivy.xml | 4 +-
- replication/ivy.xml | 2 -
- set/ivy.xml | 2 -
- tagfilter/ivy.xml | 2 -
- xml/ivy.xml | 2 -
- 21 files changed, 62 insertions(+), 57 deletions(-)
+ apidb/build.xml | 2 ++
+ build-support/script/build-ivy-base.xml | 9 ++++-----
+ build-support/script/build-java.xml | 20 ++++++++++++--------
+ build.xml | 1 +
+ core/ivy.xml | 2 +-
+ extract/build.xml | 2 ++
+ pgsimple/ivy.xml | 2 +-
+ pgsnapshot/build.xml | 2 ++
+ pgsnapshot/ivy.xml | 2 +-
+ 9 files changed, 26 insertions(+), 16 deletions(-)
--- osmosis.orig/apidb/build.xml
+++ osmosis/apidb/build.xml
@@ -45,22 +33,19 @@ Forwarded: not-needed
<property name="build-support.dir" location="../"/>
<import file="${build-support.dir}/script/build-init.xml"/>
+ <property name="debian.dir" location="${build-support.dir}/../debian/"/>
+
+ <target name="ivy-availability" description="Checks if the ivy library
is available">
+ <property name="ivy.version" value="${dependency.version.ivy}"
/>
+@@ -34,7 +35,7 @@
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
- <property name="ivy.version" value="2.1.0" />
- <property name="ivy.jar.dir" value="${build-support.dir}/ivy" />
-@@ -31,9 +32,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" />-->
+- <target name="init-ivy" depends="init, ivy-availability, download-ivy"
description="Registers ivy with ant and initializes it."
unless="ivy.initialized">
++ <target name="init-ivy" depends="init, ivy-availability"
description="Registers ivy with ant and initializes it."
unless="ivy.initialized">
<!--
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,14 +43,12 @@
+@@ -43,14 +44,12 @@
local lib dir.
-->
<path id="ivy.lib.path">
@@ -91,7 +76,7 @@ Forwarded: not-needed
<!-- Create the build directory structure. -->
<mkdir dir="build"/>
<mkdir dir="build/src"/>
-@@ -38,7 +43,7 @@
+@@ -36,7 +41,7 @@
<touch file="build/src/version-${project.version}"/>
</target>
@@ -100,7 +85,7 @@ Forwarded: not-needed
<!-- Create the build directory structure. -->
<mkdir dir="build/test"/>
-@@ -84,10 +89,9 @@
+@@ -74,10 +79,9 @@
manifest="build/binary/jar.txt"/>
<!-- Copy the jar to the distrib directory where it will be
found by ivy. -->
@@ -112,7 +97,7 @@ Forwarded: not-needed
</target>
<!-- Produces javadoc output from the source code. -->
-@@ -109,12 +113,12 @@
+@@ -99,7 +103,7 @@
</target>
<!-- Runs all of the unit tests in the application. -->
@@ -121,14 +106,7 @@ Forwarded: not-needed
<mkdir dir="report/test"/>
<!-- Determine the location of the database authorisation file.
This can be overridden outside the build if necessary. -->
-- <property name="db.apidb.authfile"
location="test/data/input/v0_6/apidb-authfile.txt"/>
-- <property name="db.pgsql.authfile"
location="test/data/input/v0_6/pgsql-authfile.txt"/>
-+ <!--<property name="db.apidb.authfile"
location="test/data/input/v0_6/apidb-authfile.txt"/>
-+ <property name="db.pgsql.authfile"
location="test/data/input/v0_6/pgsql-authfile.txt"/>-->
-
- <junit fork="no" maxmemory="512m" printsummary="on"
haltonerror="off" haltonfailure="off" filtertrace="on"
failureproperty="test.failure">
- <formatter type="plain" usefile="true"/>
-@@ -124,8 +128,8 @@
+@@ -114,8 +118,8 @@
<path location="build/src"/>
<path location="build/test"/>
</classpath>
@@ -139,7 +117,7 @@ Forwarded: not-needed
<batchtest todir="report/test">
<fileset dir="build/test">
<include name="**/*Test*.class"/>
-@@ -135,7 +139,7 @@
+@@ -125,7 +129,7 @@
</batchtest>
</junit>
@@ -148,16 +126,7 @@ Forwarded: not-needed
</target>
<target name="_clean">
-@@ -148,7 +152,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>
-@@ -156,7 +160,7 @@
+@@ -140,7 +144,7 @@
</target>
<!-- Public Targets -->
@@ -197,46 +166,6 @@ Forwarded: not-needed
</fileset>
</ivy:buildlist>
</target>
---- osmosis.orig/build-support/config/ant-build-common.properties
-+++ osmosis/build-support/config/ant-build-common.properties
-@@ -1,20 +1,20 @@
- # Contains common properties that don't vary between users.
-
- # 3rd Party Library Versions
--dependency.version.checkstyle=5.0
--dependency.version.classworlds=2.2.2
--dependency.version.commons-codec=1.4
--dependency.version.commons-compress=1.0
--dependency.version.commons-dbcp=1.4
--dependency.version.osmpbf=1.1.1-754a33af
--dependency.version.ivy=2.1.0
--dependency.version.jpf=1.5
--dependency.version.junit=4.8.1
--dependency.version.mysql=5.1.10
--dependency.version.postgis=1.3.3
--dependency.version.postgresql=8.4-701.jdbc4
--dependency.version.protobuf=2.3.0
--dependency.version.spring=3.0.3.RELEASE
--dependency.version.woodstox-core=4.0.3
--dependency.version.woodstox-stax2=3.0.2
--dependency.version.xerces=2.9.1
-+dependency.version.checkstyle=latest.integration
-+dependency.version.classworlds=latest.integration
-+dependency.version.commons-codec=latest.integration
-+dependency.version.commons-compress=latest.integration
-+dependency.version.commons-dbcp=latest.integration
-+dependency.version.osmpbf=
-+dependency.version.ivy=latest.integration
-+dependency.version.jpf=latest.integration
-+dependency.version.junit=latest.integration
-+dependency.version.mysql=latest.integration
-+dependency.version.postgis=
-+dependency.version.postgresql=jdbc4
-+dependency.version.protobuf=
-+dependency.version.spring=latest.integration
-+dependency.version.woodstox-core=latest.integration
-+dependency.version.woodstox-stax2=latest.integration
-+dependency.version.xerces=latest.integration
--- osmosis.orig/core/ivy.xml
+++ osmosis/core/ivy.xml
@@ -25,7 +25,7 @@
@@ -248,82 +177,9 @@ Forwarded: not-needed
<!-- Stax is included in the JDK from java 1.6 onwards.
-->
<exclude module="stax-api"/>
</dependency>
-@@ -41,6 +41,6 @@
- </dependency>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/apidb/ivy.xml
-+++ osmosis/apidb/ivy.xml
-@@ -34,6 +34,6 @@
- <dependency org="mysql" name="mysql-connector-java"
rev="${dependency.version.mysql}" conf="compile->default"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/areafilter/ivy.xml
-+++ osmosis/areafilter/ivy.xml
-@@ -32,6 +32,6 @@
- <dependency org="mysql" name="mysql-connector-java"
rev="${dependency.version.mysql}" conf="compile->default"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/dataset/ivy.xml
-+++ osmosis/dataset/ivy.xml
-@@ -29,6 +29,6 @@
- <dependency org="org.openstreetmap.osmosis" name="osmosis-xml"
rev="${project.version}" conf="test->default" changing="true"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/extract/ivy.xml
-+++ osmosis/extract/ivy.xml
-@@ -30,6 +30,6 @@
- <dependency org="org.openstreetmap.osmosis" name="osmosis-xml"
rev="${project.version}" conf="compile->default" changing="true"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/hstore-jdbc/ivy.xml
-+++ osmosis/hstore-jdbc/ivy.xml
-@@ -27,6 +27,6 @@
- <dependency org="postgresql" name="postgresql"
rev="${dependency.version.postgresql}" conf="compile->default"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/pbf/ivy.xml
-+++ osmosis/pbf/ivy.xml
-@@ -26,10 +26,10 @@
- <dependencies>
- <dependency org="org.openstreetmap.osmosis" name="osmosis-core"
rev="${project.version}" conf="compile->default" changing="true"/>
-
-- <dependency org="com.google.protobuf" name="protobuf-java"
rev="${dependency.version.protobuf}" conf="compile->default"/>
-+ <dependency org="com.google.protobuf" name="protobuf"
rev="${dependency.version.protobuf}" conf="compile->default"/>
- <dependency org="crosby" name="osmpbf"
rev="${dependency.version.osmpbf}" conf="compile->default" changing="true"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
--- osmosis.orig/pgsimple/ivy.xml
+++ osmosis/pgsimple/ivy.xml
-@@ -32,11 +32,11 @@
+@@ -32,7 +32,7 @@
<!--<dependency org="org.springframework" name="spring-jdbc"
rev="${dependency.version.spring}" conf="compile->default"/>-->
<!--<dependency org="commons-dbcp" name="commons-dbcp"
rev="${dependency.version.commons-dbcp}" conf="compile->default"/>-->
<dependency org="postgresql" name="postgresql"
rev="${dependency.version.postgresql}" conf="compile->default"/>
@@ -332,14 +188,9 @@ Forwarded: not-needed
<exclude module="postgis-stubs"/>
</dependency>
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
--- osmosis.orig/pgsnapshot/ivy.xml
+++ osmosis/pgsnapshot/ivy.xml
-@@ -33,11 +33,11 @@
+@@ -33,7 +33,7 @@
<dependency org="org.springframework" name="spring-jdbc"
rev="${dependency.version.spring}" conf="compile->default"/>
<dependency org="commons-dbcp" name="commons-dbcp"
rev="${dependency.version.commons-dbcp}" conf="compile->default"/>
<dependency org="postgresql" name="postgresql"
rev="${dependency.version.postgresql}" conf="compile->default"/>
@@ -348,64 +199,3 @@ Forwarded: not-needed
<exclude module="postgis-stubs"/>
</dependency>
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/replication/ivy.xml
-+++ osmosis/replication/ivy.xml
-@@ -29,6 +29,6 @@
- <dependency org="org.openstreetmap.osmosis" name="osmosis-xml"
rev="${project.version}" conf="compile->default" changing="true"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/set/ivy.xml
-+++ osmosis/set/ivy.xml
-@@ -29,6 +29,6 @@
- <dependency org="org.openstreetmap.osmosis" name="osmosis-xml"
rev="${project.version}" conf="test->default" changing="true"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/tagfilter/ivy.xml
-+++ osmosis/tagfilter/ivy.xml
-@@ -29,6 +29,6 @@
- <dependency org="org.openstreetmap.osmosis" name="osmosis-xml"
rev="${project.version}" conf="test->default" changing="true"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="com.puppycrawl.tools" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
- </dependencies>
- </ivy-module>
---- osmosis.orig/xml/ivy.xml
-+++ osmosis/xml/ivy.xml
-@@ -29,6 +29,6 @@
- <dependency org="commons-codec" name="commons-codec"
rev="${dependency.version.commons-codec}" conf="compile->default"/>
-
- <dependency org="junit" name="junit"
rev="${dependency.version.junit}" conf="test->default"/>
-- <dependency org="checkstyle" name="checkstyle"
rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <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.
diff --git a/debian/patches/03-create_manifest.patch
b/debian/patches/03-create_manifest.patch
index 4341d4d..bd78dfa 100644
--- a/debian/patches/03-create_manifest.patch
+++ b/debian/patches/03-create_manifest.patch
@@ -22,7 +22,7 @@ Forwarded: not-needed
--- osmosis.orig/build-support/script/build-java.xml
+++ osmosis/build-support/script/build-java.xml
-@@ -72,11 +72,14 @@
+@@ -62,11 +62,14 @@
<target name="_build" depends="build_src" description="Generates the
binaries for the distribution.">
<!-- Create the binary directory -->
<mkdir dir="build/binary"/>
--
Osmosis, an OSM data processor
_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
