[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn28008+ds1-1-9-gc229991

[David Paleino]

The following commit has been merged in the master branch:
commit f4d4e02686f63ab4268539ba0e89860d88cf849a
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 23 10:31:48 2012 +0200

    Fix patches

diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index 5d29753..95cec96 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: no
 
 ---
- build-common.xml |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ build-common.xml |   13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
 
 --- josm-plugins.orig/build-common.xml
 +++ josm-plugins/build-common.xml
@@ -24,3 +24,19 @@ Forwarded: no
      <property name="ant.build.javac.target" value="1.5"/>
      <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
  
+@@ -49,15 +49,6 @@
+     **********************************************************
+     -->
+     <target name="revision">
+-        <exec append="false" outputproperty="svn.revision.output" executable="svn" failifexecutionfails="false">
+-            <env key="LANG" value="C"/>
+-            <arg value="info"/>
+-            <arg value="--xml"/>
+-            <arg value="."/>
+-        </exec>
+-        <xmlproperty prefix="version" keepRoot="false" collapseAttributes="true">
+-	  <propertyresource name="svn.revision.output"/>
+-	</xmlproperty>
+     </target>
+     <!--
+     **********************************************************
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 23ea62f..52e813a 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -4,22 +4,34 @@ Origin: vendor
 Forwarded: no
 
 ---
- routing/build.xml |    9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ routing/build.xml |   13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
 
 --- 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"/>
+@@ -31,6 +31,10 @@
      <!-- 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"/>
 +
++
+     <!--
+     **********************************************************
+     ** include targets that all plugins have in common
+@@ -40,8 +44,9 @@
  
+     <!-- classpath -->
+     <path id="classpath">
+-        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
+         <pathelement path="${josm}"/>
++        <pathelement path="${jgrapht}"/>
++        <pathelement path="${log4j}"/>
+     </path>
      <!--
      **********************************************************
-@@ -58,7 +61,7 @@
+@@ -58,7 +63,7 @@
      </target>
  
      <!-- Generate distribution -->
@@ -28,7 +40,7 @@ Forwarded: no
          <copy todir="${plugin.build.dir}/images">
              <fileset dir="images"/>
          </copy>
-@@ -88,10 +91,8 @@
+@@ -88,10 +93,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"/>

-- 
Plugins for JOSM