[josm] 05/07: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Mon May 29 05:39:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit d771d6417351865f31b81d0199f6c77964967045
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon May 29 07:12:03 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 23 ++++++++++++-----------
debian/patches/01-bts.patch | 2 +-
debian/patches/03-default_look_and_feel.patch | 2 +-
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 6 +++---
debian/patches/08-use_noto_font.patch | 2 +-
7 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f4f2a9..1842fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn12271+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Add DNSNameFix.java to copyright file.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Mon, 29 May 2017 07:00:26 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 6c19ce2..c4997b2 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.11.jar"/>
+ <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
- <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.19.jar"/>
+ <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant.jar"/>
<property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
<!-- build parameter: compression level (ant -Dclevel=N)
@@ -37,6 +38,19 @@
@@ -79,10 +79,10 @@ Forwarded: not-needed
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
+ <attribute name="Debian-Release" value="${debian.version}"/>
+ <attribute name="Class-Path" value="${classpathprop}"/>
- </manifest>
- <zipfileset dir="images" prefix="images"/>
- <zipfileset dir="data" prefix="data"/>
-@@ -212,39 +229,21 @@ Build-Date: ${build.tstamp}
+ <!-- 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-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>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -125,7 +125,7 @@ Forwarded: not-needed
<exclude name="org/apache/commons/jcs/JCS.java"/>
<exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
<exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
-@@ -265,19 +264,13 @@ Build-Date: ${build.tstamp}
+@@ -268,19 +267,13 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/jcs/utils/net/**"/>
<exclude name="org/apache/commons/jcs/utils/props/**"/>
<exclude name="org/apache/commons/jcs/utils/servlet/**"/>
@@ -148,7 +148,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -291,16 +284,12 @@ Build-Date: ${build.tstamp}
+@@ -294,16 +287,12 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
@@ -166,7 +166,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -314,11 +303,6 @@ Build-Date: ${build.tstamp}
+@@ -317,12 +306,6 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
@@ -175,10 +175,11 @@ Forwarded: not-needed
- <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
- <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
- <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+- <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -332,6 +316,7 @@ Build-Date: ${build.tstamp}
+@@ -336,6 +319,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -186,7 +187,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -361,6 +346,7 @@ Build-Date: ${build.tstamp}
+@@ -365,6 +349,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}"/>
@@ -194,7 +195,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -811,6 +797,7 @@ Build-Date: ${build.tstamp}
+@@ -829,6 +814,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 352e7cd..12b4fee 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -74,7 +74,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
-@@ -294,7 +295,7 @@ public final class ShowStatusReportActio
+@@ -298,7 +299,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: ta.copyToClipboard(); break;
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index 09c6483..b6875f1 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -81,7 +81,7 @@ public class PlatformHookUnixoid impleme
+@@ -111,7 +111,7 @@ public class PlatformHookUnixoid impleme
@Override
public String getDefaultStyle() {
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 11a5a81..00e99e3 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -163,7 +163,6 @@ Debian-Release: ${debian.version}
+@@ -166,7 +166,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index e49de37..4c0241e 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,9 +6,9 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -160,9 +160,9 @@ Debian-Release: ${debian.version}
- <attribute name="Debian-Release" value="${debian.version}"/>
- <attribute name="Class-Path" value="${classpathprop}"/>
+@@ -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-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"/>
- <zipfileset dir="data" prefix="data"/>
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 2bb48a7..0ec190a 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
-@@ -124,7 +124,7 @@ public abstract class StyleElement imple
+@@ -141,7 +141,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
More information about the Pkg-grass-devel
mailing list