[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn28784+ds1-1-18-g78b536c

[David Paleino]

The following commit has been merged in the master branch:
commit 588daeab1ac08471cdb6ac62af428256aae286b6
Author: David Paleino <dapal at debian.org>
Date:   Fri Dec 21 00:12:44 2012 +0100

    Patches refreshed

diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index 3d540da..33228a1 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -24,7 +24,7 @@ Forwarded: no
      <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"/>
-@@ -50,15 +50,6 @@
+@@ -151,15 +151,6 @@
      **********************************************************
      -->
      <target name="revision">
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 8c49a8c..3916d9f 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: no
 
 ---
- routing/build.xml |   14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
+ routing/build.xml |   16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
 
 --- josm-plugins.orig/routing/build.xml
 +++ josm-plugins/routing/build.xml
@@ -20,18 +20,21 @@ Forwarded: no
      <!--
      **********************************************************
      ** include targets that all plugins have in common
-@@ -40,8 +44,9 @@
+@@ -40,11 +44,9 @@
  
      <!-- classpath -->
      <path id="classpath">
 -        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
          <pathelement path="${josm}"/>
+-        <fileset dir="../log4j/lib">
+-            <include name="**/*.jar"/>
+-        </fileset>
 +        <pathelement path="${jgrapht}"/>
 +        <pathelement path="${log4j}"/>
      </path>
      <!--
      **********************************************************
-@@ -58,7 +63,7 @@
+@@ -61,7 +63,7 @@
      </target>
  
      <!-- Generate distribution -->
@@ -40,15 +43,14 @@ Forwarded: no
          <copy todir="${plugin.build.dir}/images">
              <fileset dir="images"/>
          </copy>
-@@ -88,10 +93,9 @@
-                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
+@@ -92,9 +94,9 @@
                  <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                  <attribute name="Plugin-Stage" value="50"/>
+                 <attribute name="Plugin-Requires" value="log4j"/>
 -                <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>
 +    <target name='revision' />

-- 
Plugins for JOSM