[josm] 04/08: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Sun Jul 30 21:39:00 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 22699ad26678e000124fc76ee0f10476f59314b4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jul 30 22:51:58 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 23 +++++++++++++----------
debian/patches/06-move_data_out_of_jar.patch | 4 ++--
debian/patches/08-use_noto_font.patch | 6 +++---
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1c8630c..a152279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
josm (0.0.svn12542+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Sun, 30 Jul 2017 22:47:05 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 3dfb061..d5c9d76 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -80,9 +80,9 @@ 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 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}
+ <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 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.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
+@@ -215,42 +232,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -105,6 +105,9 @@ Forwarded: not-needed
destdir="build" target="1.8" source="1.8" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
+- <exclude name="org/apache/commons/compress/PasswordRequiredException.java"/>
+- <exclude name="org/apache/commons/compress/archivers/**"/>
+- <exclude name="org/apache/commons/compress/changes/**"/>
- <exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
- <exclude name="org/apache/commons/compress/compressors/brotli/**"/>
- <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
@@ -117,15 +120,15 @@ Forwarded: not-needed
- <exclude name="org/apache/commons/compress/compressors/gzip/**"/>
- <exclude name="org/apache/commons/compress/compressors/lz4/**"/>
- <exclude name="org/apache/commons/compress/compressors/lz77support/**"/>
-- <exclude name="org/apache/commons/compress/compressors/lzw/**"/>
- <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
- <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
- <exclude name="org/apache/commons/compress/compressors/z/**"/>
+- <exclude name="org/apache/commons/compress/parallel/**"/>
- <exclude name="org/apache/commons/compress/utils/ArchiveUtils.java"/>
<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"/>
-@@ -268,19 +267,13 @@ Build-Date: ${build.tstamp}
+@@ -271,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 +151,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -294,16 +287,12 @@ Build-Date: ${build.tstamp}
+@@ -297,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 +169,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -317,12 +306,6 @@ Build-Date: ${build.tstamp}
+@@ -320,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"/>
@@ -179,7 +182,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -336,6 +319,7 @@ Build-Date: ${build.tstamp}
+@@ -339,6 +319,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -187,7 +190,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -367,6 +351,7 @@ Build-Date: ${build.tstamp}
+@@ -370,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 +198,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -834,6 +819,7 @@ Build-Date: ${build.tstamp}
+@@ -839,6 +821,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 10b7eb8..725e9f2 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -7,8 +7,8 @@ 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 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" />
+ <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 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.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 50c8202..5a55ed7 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -7,10 +7,10 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
@@ -160,7 +160,7 @@ public abstract class StyleElement imple
synchronized (lock) {
- n = DEFAULT_FONT_NAME;
+ n = defaultFontName;
if (n == null) {
-- DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Droid Sans");
-+ DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", "Noto Sans");
+- defaultFontName = n = Main.pref.get("mappaint.font", "Droid Sans");
++ defaultFontName = n = Main.pref.get("mappaint.font", "Noto Sans");
}
}
}
--
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