The following commit has been merged in the master branch: commit 7025d12f603e83457a5b43764564d5a9ab5bdefc Author: David Paleino <da...@debian.org> Date: Tue Nov 13 20:18:26 2012 +0100
Patches refreshed diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch index 95cec96..3d540da 100644 --- a/debian/patches/00-fix_build-common.patch +++ b/debian/patches/00-fix_build-common.patch @@ -21,10 +21,10 @@ Forwarded: no <!-- this is the directory where the plugin jar is copied to --> - <property name="plugin.dist.dir" value="../../dist"/> + <property name="plugin.dist.dir" value="../dist"/> - <property name="ant.build.javac.target" value="1.5"/> + <property name="ant.build.javac.target" value="1.6"/> + <property name="ant.build.javac.source" value="1.6"/> <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> - -@@ -49,15 +49,6 @@ +@@ -50,15 +50,6 @@ ********************************************************** --> <target name="revision"> @@ -35,8 +35,8 @@ Forwarded: no - <arg value="."/> - </exec> - <xmlproperty prefix="version" keepRoot="false" collapseAttributes="true"> -- <propertyresource name="svn.revision.output"/> -- </xmlproperty> +- <propertyresource name="svn.revision.output"/> +- </xmlproperty> </target> <!-- ********************************************************** diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff index af900ee..8c49a8c 100644 --- a/debian/patches/150_routing.diff +++ b/debian/patches/150_routing.diff @@ -1,11 +1,11 @@ From: David Paleino <da...@debian.org> -Subject: Fix build classpath and MANIFEST metadata +Subject: Fix buildfile for routing plugin Origin: vendor Forwarded: no --- - routing/build.xml | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) + routing/build.xml | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) --- josm-plugins.orig/routing/build.xml +++ josm-plugins/routing/build.xml @@ -40,7 +40,7 @@ Forwarded: no <copy todir="${plugin.build.dir}/images"> <fileset dir="images"/> </copy> -@@ -88,10 +93,8 @@ +@@ -88,10 +93,9 @@ <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/> <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> <attribute name="Plugin-Stage" value="50"/> @@ -51,4 +51,5 @@ Forwarded: no - <zipfileset src="${plugin.lib.dir}/log4j-1.2.15.jar"/> </jar> </target> ++ <target name='revision' /> </project> -- Plugins for JOSM _______________________________________________ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits