[josm] 05/07: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Mon Oct 30 16:23:27 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 144c964556b55ecd9855c7e61127daf6ef4dcd5e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Oct 30 16:44:31 2017 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 25 +++++++++++++------------
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 11 ++++-------
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index facff1a..2b5fb72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn13053+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Remove BTS link from About > Info tab.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Mon, 30 Oct 2017 16:35:10 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index bd3b20b..d3ca013 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -39,7 +39,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
-@@ -101,10 +115,9 @@
+@@ -103,10 +117,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -52,7 +52,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -115,8 +128,10 @@
+@@ -117,8 +130,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -136,7 +151,7 @@ Build-Date: ${build.tstamp}
+@@ -138,7 +153,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="${build.dir}"/>
<copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
@@ -73,7 +73,7 @@ Forwarded: not-needed
<jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -146,6 +161,8 @@ Build-Date: ${build.tstamp}
+@@ -148,6 +163,8 @@ Build-Date: ${build.tstamp}
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Codebase" value="josm.openstreetmap.de"/>
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
@@ -81,8 +81,8 @@ Forwarded: not-needed
+ <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.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" />
-@@ -219,42 +236,21 @@ Build-Date: ${build.tstamp}
+ <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
+@@ -222,43 +239,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -123,12 +123,13 @@ Forwarded: not-needed
- <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/compressors/zstandard/**"/>
- <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"/>
-@@ -275,21 +271,15 @@ Build-Date: ${build.tstamp}
+@@ -279,21 +274,15 @@ 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/**"/>
@@ -153,7 +154,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -303,18 +293,14 @@ Build-Date: ${build.tstamp}
+@@ -307,18 +296,14 @@ 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"/>
@@ -173,7 +174,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -328,12 +314,6 @@ Build-Date: ${build.tstamp}
+@@ -332,12 +317,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"/>
@@ -186,7 +187,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
</javac>
-@@ -348,6 +328,7 @@ Build-Date: ${build.tstamp}
+@@ -352,6 +331,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -194,7 +195,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -380,6 +361,7 @@ Build-Date: ${build.tstamp}
+@@ -384,6 +364,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}"/>
@@ -202,7 +203,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -880,6 +862,7 @@ Build-Date: ${build.tstamp}
+@@ -886,6 +867,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index e3e93aa..d22dc80 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
-@@ -170,7 +170,6 @@ Debian-Release: ${debian.version}
+@@ -173,7 +173,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/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 961cd39..8d16538 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -156,7 +156,7 @@ Debian-Release: ${debian.version}
+@@ -158,7 +158,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index a94156e..15f3b5c 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,16 +6,13 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -167,9 +167,9 @@ Debian-Release: ${debian.version}
- <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" />
+@@ -170,9 +170,6 @@ Debian-Release: ${debian.version}
+ <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
</manifest>
+ <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
- <zipfileset dir="images" prefix="images"/>
- <zipfileset dir="data" prefix="data"/>
- <zipfileset dir="styles" prefix="styles"/>
-+ <!--<zipfileset dir="images" prefix="images"/>-->
-+ <!--<zipfileset dir="data" prefix="data"/>-->
-+ <!--<zipfileset dir="styles" prefix="styles"/>-->
</jar>
</target>
<!-- Mac OS X target -->
@@ -29,7 +26,7 @@ Forwarded: not-needed
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.ArrayList;
-@@ -268,7 +269,11 @@ public final class I18n {
+@@ -312,7 +313,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
--
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