[Pkg-osm-commits] [SCM] josm-plugins branch, master, updated. debian/0.0.svn29348+ds1-1-8-gf5986b3

[Mònica Ramírez Arceda]

The following commit has been merged in the master branch:
commit 140c12d92b03409c5e1baae87aa07603d810133e
Author: Mònica Ramírez Arceda <monica at debian.org>
Date:   Tue Sep 3 21:09:59 2013 +0200

    Refresh patches

diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index 33228a1..f798ac3 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -7,8 +7,8 @@ Forwarded: no
  build-common.xml |   13 ++-----------
  1 file changed, 2 insertions(+), 11 deletions(-)
 
---- josm-plugins.orig/build-common.xml
-+++ josm-plugins/build-common.xml
+--- a/build-common.xml
++++ b/build-common.xml
 @@ -12,12 +12,12 @@
  -->
  <project name="plugin_common" basedir=".">
@@ -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"/>
-@@ -151,15 +151,6 @@
+@@ -155,15 +155,6 @@
      **********************************************************
      -->
      <target name="revision">
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 3916d9f..0d703f4 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -7,11 +7,11 @@ Forwarded: no
  routing/build.xml |   16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
---- josm-plugins.orig/routing/build.xml
-+++ josm-plugins/routing/build.xml
-@@ -31,6 +31,10 @@
+--- a/routing/build.xml
++++ b/routing/build.xml
+@@ -6,6 +6,10 @@
      <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-     <property name="plugin.main.version" value="5464"/>
+     <property name="plugin.main.version" value="6162"/>
  
 +    <property name="jgrapht" value="/usr/share/java/jgrapht0.8.jar"/>
 +    <property name="log4j" value="/usr/share/java/log4j-1.2.jar"/>
@@ -20,7 +20,7 @@ Forwarded: no
      <!--
      **********************************************************
      ** include targets that all plugins have in common
-@@ -40,11 +44,9 @@
+@@ -15,11 +19,9 @@
  
      <!-- classpath -->
      <path id="classpath">
@@ -34,7 +34,7 @@ Forwarded: no
      </path>
      <!--
      **********************************************************
-@@ -61,7 +63,7 @@
+@@ -36,7 +38,7 @@
      </target>
  
      <!-- Generate distribution -->
@@ -43,7 +43,7 @@ Forwarded: no
          <copy todir="${plugin.build.dir}/images">
              <fileset dir="images"/>
          </copy>
-@@ -92,9 +94,9 @@
+@@ -67,9 +69,9 @@
                  <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                  <attribute name="Plugin-Stage" value="50"/>
                  <attribute name="Plugin-Requires" value="log4j"/>

-- 
Plugins for JOSM