The following commit has been merged in the master branch: commit 0c8cd2ff370d4de1a0faa01e23ff2a669efad206 Author: David Paleino <da...@debian.org> Date: Mon Apr 23 09:53:07 2012 +0200
Refresh patch diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff index 888dcd7..23ea62f 100644 --- a/debian/patches/150_routing.diff +++ b/debian/patches/150_routing.diff @@ -1,39 +1,42 @@ -Patch for plugin routing - * Disable upstream SVN access - * Fix build classpath and MANIFEST metadata +From: David Paleino <da...@debian.org> +Subject: Fix build classpath and MANIFEST metadata +Origin: vendor +Forwarded: no + --- - routing/build.xml | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) + routing/build.xml | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) -Index: josm-plugins/routing/build.xml -=================================================================== ---- josm-plugins.orig/routing/build.xml 2011-08-27 20:01:42.000000000 +0200 -+++ josm-plugins/routing/build.xml 2011-09-10 00:35:50.000000000 +0200 -@@ -33,8 +33,8 @@ - <property name="plugin.build.dir" value="build"/> - <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> - <property name="libdir" location="lib"/> -- <property name="jgrapht" value="${libdir}/jgrapht-jdk1.5.jar"/> -- <property name="log4j" value="${libdir}/log4j-1.2.15.jar"/> -+ <property name="jgrapht" value="/usr/share/java/jgrapht0.8.jar"/> -+ <property name="log4j" value="/usr/share/java/log4j-1.2.jar"/> - <property name="ant.build.javac.target" value="1.5"/> - <!-- Some initializations for several other targets --> - <target name="init"> -@@ -56,8 +56,6 @@ +--- josm-plugins.orig/routing/build.xml ++++ josm-plugins/routing/build.xml +@@ -30,6 +30,9 @@ + <property name="commit.message" value="added one-way support in roundabouts"/> + <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> + <property name="plugin.main.version" value="4980"/> ++ <property name="jgrapht" value="/usr/share/java/jgrapht0.8.jar"/> ++ <property name="log4j" value="/usr/share/java/log4j-1.2.jar"/> ++ + + <!-- + ********************************************************** +@@ -58,7 +61,7 @@ </target> + <!-- Generate distribution --> - <target name="dist" depends="compile,revision" description="Generate distribution"> -- <unjar dest="${plugin.build.dir}" src="${jgrapht}"/> -- <unjar dest="${plugin.build.dir}" src="${log4j}"/> - <copy todir="${plugin.build.dir}/"> - <fileset dir="resources"> - <include name="*.xml"/> -@@ -80,6 +78,7 @@ +- <target name="dist" depends="compile,revision" description="Generate distribution"> ++ <target name="dist" depends="compile" description="Generate distribution"> + <copy todir="${plugin.build.dir}/images"> + <fileset dir="images"/> + </copy> +@@ -88,10 +91,8 @@ + <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"/> - <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> +- <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> + <attribute name="Class-Path" value="${jgrapht} ${log4j}"/> </manifest> +- <zipfileset src="${plugin.lib.dir}/jgrapht-jdk1.5.jar"/> +- <zipfileset src="${plugin.lib.dir}/log4j-1.2.15.jar"/> </jar> </target> + </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