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

Bas Couwenberg sebastic at debian.org
Fri Aug 12 14:30:59 UTC 2016


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

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

commit 7e1bcecfe77ca20d5abdc95b661f9704c865fa2d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 12 15:30:05 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 55a8d1f..e886f1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ josm-plugins (0.0.svn32805+ds-1) UNRELEASED; urgency=medium
     - switch to Java 8
   * Update JDK dependency to require at least version 1.8.
   * Bump JOSM dependency to 10786.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 12 Aug 2016 13:35:50 +0200
 
diff --git a/debian/patches/00-fix_build-common.patch b/debian/patches/00-fix_build-common.patch
index aa752a5..7b8648f 100644
--- a/debian/patches/00-fix_build-common.patch
+++ b/debian/patches/00-fix_build-common.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/build-common.xml
 +++ b/build-common.xml
-@@ -12,7 +12,7 @@
+@@ -12,10 +12,9 @@
  -->
  <project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
  
@@ -16,17 +16,39 @@ Forwarded: not-needed
 +    <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="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.0-all.jar"/>
-@@ -23,7 +23,7 @@
+-    <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.11.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 @@
      <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 -->
 -    <property name="plugin.dist.dir"        location="../../dist"/>
 +    <property name="plugin.dist.dir"        location="../dist"/>
-     <property name="ant.build.javac.target" value="1.7"/>
-     <property name="ant.build.javac.source" value="1.7"/>
+     <property name="ant.build.javac.target" value="1.8"/>
+     <property name="ant.build.javac.source" value="1.8"/>
      <property name="plugin.jar"             location="${plugin.dist.dir}/${ant.project.name}.jar"/>
-@@ -273,10 +273,13 @@
+-    <property name="javac.compiler"         value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
+ 
+     <!-- For Windows-specific stuff -->
+     <condition property="isWindows">
+@@ -72,13 +70,9 @@
+     </target>
+     <target name="compile" depends="init, pre-compile" unless="skip-compile">
+         <echo message="compiling sources for ${plugin.jar} ..."/>
+-        <javac compiler="${javac.compiler}" srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
+-            <compilerclasspath>
+-                <pathelement location="${error_prone_ant.jar}"/>
+-            </compilerclasspath>
++        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
+             <compilerarg value="-Xlint:deprecation"/>
+             <compilerarg value="-Xlint:unchecked"/>
+-            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+             <compilerarg line="-Xmaxwarns 1000"/>
+             <classpath refid="plugin.classpath"/>
+         </javac>
+@@ -280,10 +274,13 @@
          </tstamp>
          <echo file="REVISION.XML"><![CDATA[<info><entry><commit revision="UNKNOWN"><date>${current.time}</date></commit></entry></info>]]></echo>
      </target>
diff --git a/debian/patches/150_routing.diff b/debian/patches/150_routing.diff
index eb99528..81f8b8b 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="10279"/>
+     <property name="plugin.main.version" value="10580"/>
  
 +    <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



More information about the Pkg-grass-devel mailing list