The following commit has been merged in the master branch: commit 48732c0107a7ef0c47029022debb0f4a9e4c25b2 Author: David Paleino <da...@debian.org> Date: Wed Sep 28 10:13:08 2011 +0200
Patches refreshed diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch index bdcc178..bef05fb 100644 --- a/debian/patches/00-fix_build_system.patch +++ b/debian/patches/00-fix_build_system.patch @@ -2,17 +2,15 @@ apidb/build.xml | 2 ++ build-support/config/ant-build-common.properties | 4 ++-- build-support/script/build-ivy-base.xml | 11 +++++------ - build-support/script/build-java.xml | 10 +++++----- + build-support/script/build-java.xml | 12 ++++++------ build.xml | 1 + core/ivy.xml | 2 +- extract/build.xml | 2 ++ pgsnapshot/build.xml | 2 ++ - 8 files changed, 20 insertions(+), 14 deletions(-) + 8 files changed, 21 insertions(+), 15 deletions(-) -Index: osmosis/apidb/build.xml -=================================================================== ---- 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 +--- osmosis.orig/apidb/build.xml ++++ osmosis/apidb/build.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="Osmosis.Apidb" default="all" basedir="."> @@ -22,10 +20,8 @@ Index: osmosis/apidb/build.xml <!-- 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-31 01:07:47.000000000 +0100 -+++ osmosis/build-support/script/build-ivy-base.xml 2011-08-14 22:45:09.000000000 +0200 +--- osmosis.orig/build-support/script/build-ivy-base.xml ++++ osmosis/build-support/script/build-ivy-base.xml @@ -9,6 +9,7 @@ <!-- Include common build components. --> <property name="build-support.dir" location="../"/> @@ -63,10 +59,8 @@ Index: osmosis/build-support/script/build-ivy-base.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 2011-08-14 22:44:33.000000000 +0200 -+++ osmosis/build-support/script/build-java.xml 2011-08-14 22:45:31.000000000 +0200 +--- osmosis.orig/build-support/script/build-java.xml ++++ osmosis/build-support/script/build-java.xml @@ -109,12 +109,12 @@ </target> @@ -103,10 +97,8 @@ Index: osmosis/build-support/script/build-java.xml <fileset dir="test/data/input"> <include name="**/*"/> </fileset> -Index: osmosis/extract/build.xml -=================================================================== ---- 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 +--- osmosis.orig/extract/build.xml ++++ osmosis/extract/build.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="Osmosis.Extract" default="all" basedir="."> @@ -116,10 +108,8 @@ Index: osmosis/extract/build.xml <!-- 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-31 01:07:47.000000000 +0100 -+++ osmosis/pgsnapshot/build.xml 2011-08-14 22:45:09.000000000 +0200 +--- osmosis.orig/pgsnapshot/build.xml ++++ osmosis/pgsnapshot/build.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="Osmosis.PgSnapshot" default="all" basedir="."> @@ -128,10 +118,8 @@ Index: osmosis/pgsnapshot/build.xml <!-- Include common java build. --> <property name="build-support.dir" location="../build-support"/> -Index: osmosis/build.xml -=================================================================== ---- osmosis.orig/build.xml 2011-01-31 01:07:47.000000000 +0100 -+++ osmosis/build.xml 2011-08-14 22:45:09.000000000 +0200 +--- osmosis.orig/build.xml ++++ osmosis/build.xml @@ -10,6 +10,7 @@ <fileset dir="."> <include name="**/build.xml"/> @@ -140,29 +128,25 @@ Index: osmosis/build.xml </fileset> </ivy:buildlist> </target> -Index: osmosis/build-support/config/ant-build-common.properties -=================================================================== ---- 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 - dependency.version.jpf=1.5 --dependency.version.junit=4.8.1 -+dependency.version.junit=latest.integration - 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-core=latest.integration - dependency.version.woodstox-stax2=3.0.2 - dependency.version.xerces=2.9.1 -Index: osmosis/core/ivy.xml -=================================================================== ---- 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 +--- osmosis.orig/build-support/config/ant-build-common.properties ++++ osmosis/build-support/config/ant-build-common.properties +@@ -9,12 +9,12 @@ 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.junit=latest.integration + 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-core=latest.integration + dependency.version.woodstox-stax2=3.0.2 + dependency.version.xerces=2.9.1 +--- osmosis.orig/core/ivy.xml ++++ osmosis/core/ivy.xml @@ -25,7 +25,7 @@ <dependencies> diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch index 8331ea8..01416fe 100644 --- a/debian/patches/01-fix_launcher.patch +++ b/debian/patches/01-fix_launcher.patch @@ -6,11 +6,9 @@ Forwarded: not-needed package/bin/osmosis | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -Index: osmosis/package/bin/osmosis -=================================================================== ---- osmosis.orig/package/bin/osmosis 2011-01-11 19:05:21.000000000 +0100 -+++ osmosis/package/bin/osmosis 2011-01-11 19:05:33.000000000 +0100 -@@ -61,15 +61,13 @@ +--- osmosis.orig/package/bin/osmosis ++++ osmosis/package/bin/osmosis +@@ -61,15 +61,13 @@ exit 1 fi # make it fully qualified @@ -26,7 +24,7 @@ Index: osmosis/package/bin/osmosis +MYAPP_CLASSPATH=$MYAPP_HOME/osmosis.jar:$LIBRARIES_HOME/plexus-classworlds.jar MAINCLASS=org.codehaus.classworlds.Launcher --EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS $@" -+EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=/etc/osmosis/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS $@" +-EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS" ++EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=/etc/osmosis/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS" - exec $EXEC + exec $EXEC "$@" -- Osmosis, an OSM data processor _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel