[josm-plugins] 05/06: Refresh patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm-plugins.

commit afbc76c017274fcf715aec4d573b034fcf9b8b28
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 12 13:10:05 2016 +0200

    Refresh patches.
---
 debian/changelog                         |  1 +
 debian/patches/00-fix_build-common.patch | 10 +++++-----
 debian/patches/150_routing.diff          |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d90303..f04faac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm-plugins (0.0.svn32641+ds-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
   * Bump JOSM dependency to 10526.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jul 2016 13:05:01 +0200
 
diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index d320c6f..aa752a5 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -15,9 +15,9 @@ Forwarded: not-needed
 -    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
 +    <property name="josm"                   location="/usr/share/josm/josm.jar"/>
      <property name="josm.test.build.dir"    location="../../core/test/build"/>
-     <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.4.6.jar"/>
-     <property name="annotations.jar"        location="../00_core_tools/findbugs/annotations.jar"/>
-@@ -21,7 +21,7 @@
+     <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.4.7.jar"/>
+     <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.0-all.jar"/>
+@@ -23,7 +23,7 @@
      <property name="plugin.src.dir"         location="src"/>
      <property name="plugin.lib.dir"         location="lib"/>
      <!-- this is the directory where the plugin jar is copied to -->
@@ -26,12 +26,12 @@ Forwarded: not-needed
      <property name="ant.build.javac.target" value="1.7"/>
      <property name="ant.build.javac.source" value="1.7"/>
      <property name="plugin.jar"             location="${plugin.dist.dir}/${ant.project.name}.jar"/>
-@@ -266,10 +266,13 @@
+@@ -273,10 +273,13 @@
          </tstamp>
          <echo file="REVISION.XML"><![CDATA[<info><entry><commit revision="UNKNOWN"><date>${current.time}</date></commit></entry></info>]]></echo>
      </target>
 +    <!--
-     <target name="revision" depends="init-svn-revision-xml, init-git-svn-revision-xml, init-git-revision-xml, init-revision-fallback">
+     <target name="revision" depends="init-svn-revision-xml, init-git-svn-revision-xml, init-git-revision-xml, init-revision-fallback" unless="skip-revision">
        <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
        <delete file="REVISION.XML"/>
      </target>
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index 37bbe4c..eb99528 100644
--- a/debian/patches/150_routing.diff
+++ b/debian/patches/150_routing.diff
@@ -10,7 +10,7 @@ Forwarded: not-needed
 +++ 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="7001"/>
+     <property name="plugin.main.version" value="10279"/>
  
 +    <property name="jgrapht" value="/usr/share/java/jgrapht0.8.jar"/>
 +    <property name="log4j" value="/usr/share/java/log4j-1.2.jar"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git