[osmosis] 13/28: Remove obsolete patches.
Bas Couwenberg
sebastic at xs4all.nl
Sun Apr 6 01:47:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osmosis.
commit 27ef7e3ea440f65747c19ab769c51cde23d0973b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 16 15:35:43 2014 +0100
Remove obsolete patches.
---
debian/patches/00-fix_build_system.patch | 218 ----------------------
debian/patches/03-create_manifest.patch | 120 ------------
debian/patches/04-fix_dependencies_versions.patch | 44 -----
debian/patches/06-no-woodstox.patch | 23 ---
debian/patches/series | 4 -
5 files changed, 409 deletions(-)
diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
deleted file mode 100644
index 8c8f678..0000000
--- a/debian/patches/00-fix_build_system.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix build system not to FTBFS
-Origin: vendor
-Forwarded: not-needed
-
----
- 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 +-
- xml/ivy.xml | 1 +
- 10 files changed, 27 insertions(+), 16 deletions(-)
-
-Index: osmosis/apidb/build.xml
-===================================================================
---- osmosis.orig/apidb/build.xml 2012-01-11 16:33:26.000000000 +0100
-+++ osmosis/apidb/build.xml 2012-01-11 16:46:53.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 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml 2012-01-11 16:46:53.000000000 +0100
-@@ -9,6 +9,7 @@
- <!-- Include common build components. -->
- <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>
-
-- <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
-@@ -43,14 +44,12 @@
- 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" />
-
-- <!-- Override the shared repo location to point at the svn-based ivy repo. -->
-- <property name="ivy.shared.default.root" location="${build-support.dir}/repo"/>
-- <ivy:configure />
-+ <ivy:configure file="${debian.dir}/ivysettings.xml"/>
-
- <!-- Retrieve ivy details from the config file. -->
- <ivy:info />
-Index: osmosis/build-support/script/build-java.xml
-===================================================================
---- osmosis.orig/build-support/script/build-java.xml 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml 2012-01-11 16:47:58.000000000 +0100
-@@ -23,6 +23,11 @@
- </path>
-
- <target name="build_src" depends="resolve" description="Compile source code into class files.">
-+ <!-- Check if test directory exists, needed for build_test -->
-+ <condition property="testdir.exists">
-+ <available file="test/" type="dir"/>
-+ </condition>
-+
- <!-- Create the build directory structure. -->
- <mkdir dir="build"/>
- <mkdir dir="build/src"/>
-@@ -36,7 +41,7 @@
- <touch file="build/src/version-${project.version}"/>
- </target>
-
-- <target name="build_test" depends="build_src" description="Compile test source code into class files.">
-+ <target name="build_test" depends="build_src" description="Compile test source code into class files." if="testdir.exists">
- <!-- Create the build directory structure. -->
- <mkdir dir="build/test"/>
-
-@@ -74,10 +79,9 @@
- manifest="build/binary/jar.txt"/>
-
- <!-- Copy the jar to the distrib directory where it will be found by ivy. -->
-- <mkdir dir="distrib"/>
- <copy
- file="build/binary/${project.name}.jar"
-- tofile="distrib/jars/${project.name}-${project.version}.jar"/>
-+ tofile="${debian.dir}/../build/${project.name}.jar"/>
- </target>
-
- <!-- Produces javadoc output from the source code. -->
-@@ -99,7 +103,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" if="testdir.exists">
- <mkdir dir="report/test"/>
-
- <!-- Determine the location of the database authorisation file. This can be overridden outside the build if necessary. -->
-@@ -114,8 +118,8 @@
- <path location="build/src"/>
- <path location="build/test"/>
- </classpath>
-- <sysproperty key="db.apidb.authfile" value="${db.apidb.authfile}"/>
-- <sysproperty key="db.pgsql.authfile" value="${db.pgsql.authfile}"/>
-+ <!--<sysproperty key="db.apidb.authfile" value="${db.apidb.authfile}"/>
-+ <sysproperty key="db.pgsql.authfile" value="${db.pgsql.authfile}"/>-->
- <batchtest todir="report/test">
- <fileset dir="build/test">
- <include name="**/*Test*.class"/>
-@@ -125,7 +129,7 @@
- </batchtest>
- </junit>
-
-- <fail message="One or more junit tests failed." if="test.failure" />
-+<!-- <fail message="One or more junit tests failed." if="test.failure" /> -->
- </target>
-
- <target name="_clean">
-@@ -140,7 +144,7 @@
- </target>
-
- <!-- Public Targets -->
-- <target name="all" depends="build, checkstyle, test, publish" description="Executes all major build targets."/>
-+ <target name="all" depends="build, test" description="Executes all major build targets."/>
- <target name="clean" depends="_clean" description="Clean up the project tree."/>
- <target name="build" depends="_build" description="Builds the main project target."/>
- </project>
-Index: osmosis/extract/build.xml
-===================================================================
---- osmosis.orig/extract/build.xml 2012-01-11 16:33:26.000000000 +0100
-+++ osmosis/extract/build.xml 2012-01-11 16:46:53.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 2012-01-11 16:33:26.000000000 +0100
-+++ osmosis/pgsnapshot/build.xml 2012-01-11 16:46:53.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"/>
-Index: osmosis/build.xml
-===================================================================
---- osmosis.orig/build.xml 2012-01-11 16:33:26.000000000 +0100
-+++ osmosis/build.xml 2012-01-11 16:46:53.000000000 +0100
-@@ -10,6 +10,7 @@
- <fileset dir=".">
- <include name="**/build.xml"/>
- <exclude name="build.xml"/>
-+ <exclude name=".pc/**/build.xml"/>
- </fileset>
- </ivy:buildlist>
- </target>
-Index: osmosis/pgsimple/ivy.xml
-===================================================================
---- osmosis.orig/pgsimple/ivy.xml 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/pgsimple/ivy.xml 2012-01-11 16:46:53.000000000 +0100
-@@ -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"/>
-- <dependency org="org.postgis" name="postgis-jdbc" rev="${dependency.version.postgis}" conf="compile->default">
-+ <dependency org="org.postgis" name="postgis" rev="${dependency.version.postgis}" conf="compile->default">
- <exclude module="postgis-stubs"/>
- </dependency>
-
-Index: osmosis/pgsnapshot/ivy.xml
-===================================================================
---- osmosis.orig/pgsnapshot/ivy.xml 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/pgsnapshot/ivy.xml 2012-01-11 16:46:53.000000000 +0100
-@@ -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"/>
-- <dependency org="org.postgis" name="postgis-jdbc" rev="${dependency.version.postgis}" conf="compile->default">
-+ <dependency org="org.postgis" name="postgis" rev="${dependency.version.postgis}" conf="compile->default">
- <exclude module="postgis-stubs"/>
- </dependency>
-
-Index: osmosis/xml/ivy.xml
-===================================================================
---- osmosis.orig/xml/ivy.xml 2012-01-11 16:33:29.000000000 +0100
-+++ osmosis/xml/ivy.xml 2012-01-11 16:46:53.000000000 +0100
-@@ -31,5 +31,6 @@
- <dependency org="org.openstreetmap.osmosis" name="osmosis-testutil" rev="${project.version}" conf="test->default" changing="true"/>
- <dependency org="junit" name="junit" rev="${dependency.version.junit}" conf="test->default"/>
- <dependency org="com.puppycrawl.tools" name="checkstyle" rev="${dependency.version.checkstyle}" conf="test->default"/>
-+ <dependency org="org.apache.commons" name="commons-compress" rev="${dependency.version.commons-compress}" conf="compile->default"/>
- </dependencies>
- </ivy-module>
diff --git a/debian/patches/03-create_manifest.patch b/debian/patches/03-create_manifest.patch
deleted file mode 100644
index 9b6f88e..0000000
--- a/debian/patches/03-create_manifest.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: write Class-Path into per-jar MANIFEST.MF
-Origin: vendor
-Forwarded: not-needed
-
----
- apidb/jar.properties | 1 +
- areafilter/jar.properties | 1 +
- build-support/script/build-java.xml | 5 ++++-
- core/jar.properties | 1 +
- dataset/jar.properties | 1 +
- extract/jar.properties | 1 +
- hstore-jdbc/jar.properties | 1 +
- pbf/jar.properties | 1 +
- pgsimple/jar.properties | 1 +
- pgsnapshot/jar.properties | 1 +
- replication/jar.properties | 1 +
- set/jar.properties | 1 +
- tagfilter/jar.properties | 1 +
- xml/jar.properties | 1 +
- 14 files changed, 17 insertions(+), 1 deletion(-)
-
-Index: osmosis/build-support/script/build-java.xml
-===================================================================
---- osmosis.orig/build-support/script/build-java.xml 2012-01-11 16:46:53.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml 2012-01-11 16:46:53.000000000 +0100
-@@ -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"/>
--
-+
-+ <property file="jar.properties" />
-+
- <!-- Create a manifest for the jar file. -->
- <manifest file="build/binary/jar.txt">
- <attribute name="Main-Class" value="org.openstreetmap.osmosis.core.Osmosis"/>
- <attribute name="Built-By" value="${user.name}"/>
-+ <attribute name="Class-Path" value="${jar.classpath}"/>
- <attribute name="Implementation-Title" value="Osmosis Library"/>
- <attribute name="Implementation-Version" value="${project.version} (${TODAY})"/>
- <attribute name="Implementation-Vendor" value="Brett Henderson"/>
-Index: osmosis/apidb/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/apidb/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
-Index: osmosis/areafilter/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/areafilter/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
-Index: osmosis/core/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/core/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/java/jpf.jar /usr/share/java/stax2-api.jar /usr/share/java/commons-compress.jar /usr/share/java/xercesImpl.jar
-Index: osmosis/dataset/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/dataset/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar
-Index: osmosis/extract/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/extract/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-apidb.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar
-Index: osmosis/hstore-jdbc/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/hstore-jdbc/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/java/postgresql.jar
-Index: osmosis/pbf/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/pbf/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/java/protobuf-java.jar /usr/share/java/osmpbf.jar
-Index: osmosis/pgsimple/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/pgsimple/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar /usr/share/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar
-Index: osmosis/pgsnapshot/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/pgsnapshot/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar
-Index: osmosis/replication/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/replication/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-set.jar /usr/share/osmosis/osmosis-xml.jar
-Index: osmosis/set/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/set/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar
-Index: osmosis/tagfilter/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/tagfilter/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar
-Index: osmosis/xml/jar.properties
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ osmosis/xml/jar.properties 2012-01-11 16:46:53.000000000 +0100
-@@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/java/commons-codec.jar /usr/share/java/commons-compress.jar
diff --git a/debian/patches/04-fix_dependencies_versions.patch b/debian/patches/04-fix_dependencies_versions.patch
deleted file mode 100644
index 7ae2bde..0000000
--- a/debian/patches/04-fix_dependencies_versions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix needed versions of packages, so that they match the ones
- available in Debian
-Origin: vendor
-Forwarded: not-needed
-
----
- build-support/config/ant-build-common.properties | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: osmosis/build-support/config/ant-build-common.properties
-===================================================================
---- osmosis.orig/build-support/config/ant-build-common.properties 2012-06-15 12:13:49.000000000 +0200
-+++ osmosis/build-support/config/ant-build-common.properties 2012-06-15 12:15:52.000000000 +0200
-@@ -2,19 +2,18 @@
-
- # 3rd Party Library Versions
- dependency.version.checkstyle=5.4
--dependency.version.classworlds=2.4
--dependency.version.commons-codec=1.5
--dependency.version.commons-compress=1.2
-+dependency.version.classworlds=debian
-+dependency.version.commons-codec=debian
-+dependency.version.commons-compress=debian
- dependency.version.commons-dbcp=1.4
--dependency.version.osmpbf=1.1.1-754a33af
-+dependency.version.osmpbf=
- dependency.version.ivy=2.2.0
- dependency.version.jpf=1.5
--dependency.version.junit=4.10
--dependency.version.mysql=5.1.18
--dependency.version.postgis=1.3.3
--dependency.version.postgresql=9.0-801.jdbc4
--dependency.version.protobuf=2.4.1
-+dependency.version.junit=4.x
-+dependency.version.mysql=debian
-+dependency.version.postgis=
-+dependency.version.postgresql=
-+dependency.version.protobuf=debian
- dependency.version.spring=3.0.6.RELEASE
--dependency.version.woodstox-core=4.1.2
- dependency.version.woodstox-stax2=3.1.1
--dependency.version.xerces=2.9.1
-+dependency.version.xerces=debian
diff --git a/debian/patches/06-no-woodstox.patch b/debian/patches/06-no-woodstox.patch
deleted file mode 100644
index f562c72..0000000
--- a/debian/patches/06-no-woodstox.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix missing woodstox dependency
-Forwarded: no
-
----
- core/ivy.xml | 4 ----
- 1 file changed, 4 deletions(-)
-
-Index: osmosis/core/ivy.xml
-===================================================================
---- osmosis.orig/core/ivy.xml 2012-06-15 12:01:32.000000000 +0200
-+++ osmosis/core/ivy.xml 2012-06-15 12:08:29.000000000 +0200
-@@ -25,10 +25,6 @@
-
- <dependencies>
- <dependency org="net.sf.jpf" name="jpf" rev="${dependency.version.jpf}" conf="compile->default"/>
-- <dependency org="org.codehaus.woodstox" name="woodstox-core-lgpl" rev="${dependency.version.woodstox-core}" conf="compile->default">
-- <!-- Stax is included in the JDK from java 1.6 onwards. -->
-- <exclude module="stax-api"/>
-- </dependency>
- <!-- Include this explicitly to increase the version number. The default transitively included one has incorrect sha-1 checksums. -->
- <dependency org="org.codehaus.woodstox" name="stax2-api" rev="${dependency.version.woodstox-stax2}" conf="compile->default">
- <!-- Stax is included in the JDK from java 1.6 onwards. -->
diff --git a/debian/patches/series b/debian/patches/series
index 501461a..cfdb821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
-00-fix_build_system.patch
01-fix_launcher.patch
02-fix_plexus.patch
-03-create_manifest.patch
-04-fix_dependencies_versions.patch
-06-no-woodstox.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git
More information about the Pkg-grass-devel
mailing list