The following commit has been merged in the master branch:
commit d251288778639f81180914a62514da12c27c00b8
Author: Giovanni Mascellani <g...@debian.org>
Date:   Sat Sep 10 00:36:48 2011 +0200

    Patches refreshed and updated for last release.

diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 4c354ad..888dcd7 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -5,35 +5,35 @@ Patch for plugin routing
  routing/build.xml |    9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
---- josm-plugins.orig/routing/build.xml
-+++ josm-plugins/routing/build.xml
-@@ -34,8 +34,8 @@
-       <property name="plugin.dist.dir"        value="../../dist"/>
-       <property name="plugin.build.dir"       value="build"/>
-       <property name="plugin.jar"             
value="${plugin.dist.dir}/${ant.project.name}.jar"/>
--      <property name="jgrapht"                value="lib/jgrapht-jdk1.5.jar"/>
--      <property name="log4j"                  value="lib/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">
-@@ -55,9 +55,7 @@
-               </javac>
-       </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}"/>
-+      <target name="dist" depends="compile" description="Generate 
distribution">
-               <copy todir="${plugin.build.dir}/">
-                       <fileset dir="resources">
-                               <include name="*.xml"/>
-@@ -77,6 +75,7 @@
-                               <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="Class-Path" value="${jgrapht} 
${log4j}"/>
-                       </manifest>
-               </jar>
-       </target>
+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 @@
+     </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 @@
+                 <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="Class-Path" value="${jgrapht} ${log4j}"/>
+             </manifest>
+         </jar>
+     </target>

-- 
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

Reply via email to