[josm] 04/09: 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.

commit d788ff4486cc7fd0ec65d9325f990b0bc4d2d34a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 1 11:38:25 2017 +0200

    Refresh patches.
---
 debian/changelog                             | 1 +
 debian/patches/00-build.patch                | 8 ++++----
 debian/patches/06-move_data_out_of_jar.patch | 2 +-
 debian/patches/08-use_noto_font.patch        | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45a4e11..8141fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn12443+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 01 Jul 2017 11:32:37 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index c4997b2..387e3f3 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -21,7 +21,7 @@ Forwarded: not-needed
          <!-- build parameter: compression level (ant -Dclevel=N)
 @@ -37,6 +38,19 @@
          <condition property="isJava9">
-             <equals arg1="${ant.java.version}" arg2="1.9" />
+             <matches string="${ant.java.version}" pattern="(1.)?9" />
          </condition>
 +        <!-- Java classpath addition (all jar files to compile tests with this) -->
 +        <path id="classpath">
@@ -80,7 +80,7 @@ Forwarded: not-needed
 +                <attribute name="Debian-Release" value="${debian.version}"/>
 +                <attribute name="Class-Path" value="${classpathprop}"/>
                  <!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
-                 <attribute name="Add-Exports" value="java.base/sun.security.util java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi jdk.deploy/com.sun.deploy.config" />
+                 <attribute name="Add-Exports" value="java.base/sun.security.util java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
                  <attribute name="Add-Opens" value="java.base/java.lang java.base/jdk.internal.loader java.base/sun.security.x509 java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
 @@ -215,39 +232,21 @@ Build-Date: ${build.tstamp}
      </target>
@@ -187,7 +187,7 @@ Forwarded: not-needed
      </target>
      <target name="javadoc" depends="init-properties">
          <javadoc destdir="javadoc"
-@@ -365,6 +349,7 @@ Build-Date: ${build.tstamp}
+@@ -367,6 +351,7 @@ Build-Date: ${build.tstamp}
          <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
          <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
          <delete file="${epsg.output}"/>
@@ -195,7 +195,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -829,6 +814,7 @@ Build-Date: ${build.tstamp}
+@@ -834,6 +819,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 4c0241e..10b7eb8 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
 @@ -163,9 +163,9 @@ Debian-Release: ${debian.version}
-                 <attribute name="Add-Exports" value="java.base/sun.security.util java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi jdk.deploy/com.sun.deploy.config" />
+                 <attribute name="Add-Exports" value="java.base/sun.security.util java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
                  <attribute name="Add-Opens" value="java.base/java.lang java.base/jdk.internal.loader java.base/sun.security.x509 java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
              </manifest>
 -            <zipfileset dir="images" prefix="images"/>
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 0ec190a..50c8202 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -5,7 +5,7 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
 
 --- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
 +++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
-@@ -141,7 +141,7 @@ public abstract class StyleElement imple
+@@ -160,7 +160,7 @@ public abstract class StyleElement imple
              synchronized (lock) {
                  n = DEFAULT_FONT_NAME;
                  if (n == null) {

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