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

Bas Couwenberg sebastic at debian.org
Sat Jan 7 23:35:31 UTC 2017


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

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

commit 0044ccb4e084584ef7e6c8d105179dba865170df
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 7 23:34:26 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 6672253..2f9a9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm-plugins (0.0.svn33112+ds-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
   * Bump JOSM dependency to 11427.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 07 Jan 2017 23:31:05 +0100
 
diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index bd8bbab..31d7dc6 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -15,8 +15,8 @@ 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="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.13.jar"/>
-     <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.2-all.jar"/>
+     <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.14.jar"/>
+     <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.4-all.jar"/>
 @@ -23,11 +23,10 @@
      <property name="plugin.src.dir"         location="src"/>
      <property name="plugin.lib.dir"         location="lib"/>
@@ -30,7 +30,7 @@ Forwarded: not-needed
  
      <!-- For Windows-specific stuff -->
      <condition property="isWindows">
-@@ -75,13 +74,9 @@
+@@ -75,14 +74,9 @@
      </target>
      <target name="compile" depends="init, pre-compile" unless="skip-compile">
          <echo message="compiling sources for ${plugin.jar} ..."/>
@@ -42,10 +42,11 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:unchecked"/>
 -            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+-            <compilerarg value="-Xep:InsecureCryptoUsage:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
              <compilerarg line="-Xmaxwarns 1000"/>
              <classpath refid="plugin.classpath"/>
          </javac>
-@@ -283,10 +278,13 @@
+@@ -284,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



More information about the Pkg-grass-devel mailing list