[josm-plugins] 04/07: 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 689657e48db02b4b13dda98d7ffccf1fda624323
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 6 10:34:45 2016 +0200

    Refresh patches.
---
 debian/changelog                         |  1 +
 debian/patches/00-fix_build-common.patch | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78e2ad9..eb7c745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ josm-plugins (0.0.svn32928+ds-1) UNRELEASED; urgency=medium
   * New upstream SVN snapshot.
   * Drop Debian OpenStreetMap Team from Uploaders.
   * Include epoch in default-jdk version requirement.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Sep 2016 09:33:47 +0200
 
diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index 7b8648f..d39be95 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -8,19 +8,16 @@ Forwarded: not-needed
 
 --- a/build-common.xml
 +++ b/build-common.xml
-@@ -12,10 +12,9 @@
+@@ -12,7 +12,7 @@
  -->
  <project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
  
 -    <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.7.jar"/>
--    <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.11.jar"/>
+     <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.12.jar"/>
      <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.1-all.jar"/>
-     <property name="findbugs-ant.jar"       location="../00_core_tools/findbugs/findbugs-ant.jar"/>
-     <property name="annotations.jar"        location="../00_core_tools/findbugs/annotations.jar"/>
-@@ -24,11 +23,10 @@
+@@ -23,11 +23,10 @@
      <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 -->
@@ -33,7 +30,7 @@ Forwarded: not-needed
  
      <!-- For Windows-specific stuff -->
      <condition property="isWindows">
-@@ -72,13 +70,9 @@
+@@ -75,13 +74,9 @@
      </target>
      <target name="compile" depends="init, pre-compile" unless="skip-compile">
          <echo message="compiling sources for ${plugin.jar} ..."/>
@@ -48,7 +45,7 @@ Forwarded: not-needed
              <compilerarg line="-Xmaxwarns 1000"/>
              <classpath refid="plugin.classpath"/>
          </javac>
-@@ -280,10 +274,13 @@
+@@ -283,10 +278,13 @@
          </tstamp>
          <echo file="REVISION.XML"><![CDATA[<info><entry><commit revision="UNKNOWN"><date>${current.time}</date></commit></entry></info>]]></echo>
      </target>

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