Commit c8a388b5 authored by Bas Couwenberg's avatar Bas Couwenberg

Refresh patches.

parent 3cb75e52
josm (0.0.svn14760+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Refresh patches.
-- Bas Couwenberg <sebastic@debian.org> Tue, 05 Feb 2019 07:00:26 +0100
......
......@@ -9,15 +9,15 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -39,6 +39,7 @@
<property name="proj-build.dir" location="${base.dir}/build2"/>
@@ -40,6 +40,7 @@
<property name="taginfo-build.dir" location="${base.dir}/build2"/>
<property name="checkstyle-build.dir" location="${base.dir}/build2"/>
<property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
<property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
<property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
<property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
@@ -72,10 +73,22 @@
@@ -73,10 +74,22 @@
<isset property="isJava9"/>
</condition>
<path id="groovy.classpath">
......@@ -42,7 +42,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
@@ -142,10 +155,9 @@
@@ -143,10 +156,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
......@@ -55,7 +55,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
@@ -156,8 +168,10 @@
@@ -157,8 +169,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
......@@ -67,7 +67,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
@@ -177,7 +191,7 @@ Build-Date: ${build.tstamp}
@@ -178,7 +192,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="${build.dir}"/>
<copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
......@@ -76,7 +76,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>
@@ -187,6 +201,8 @@ Build-Date: ${build.tstamp}
@@ -188,6 +202,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"/>
......@@ -85,7 +85,7 @@ Forwarded: not-needed
<!-- 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/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" />
@@ -261,43 +277,21 @@ Build-Date: ${build.tstamp}
@@ -262,43 +278,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
......@@ -132,7 +132,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"/>
@@ -318,22 +312,15 @@ Build-Date: ${build.tstamp}
@@ -319,22 +313,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/**"/>
......@@ -158,7 +158,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -347,19 +334,14 @@ Build-Date: ${build.tstamp}
@@ -348,19 +335,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"/>
......@@ -179,7 +179,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -373,7 +355,6 @@ Build-Date: ${build.tstamp}
@@ -374,7 +356,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"/>
......@@ -187,7 +187,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
@@ -388,6 +369,7 @@ Build-Date: ${build.tstamp}
@@ -389,6 +370,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
......@@ -195,7 +195,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
@@ -423,6 +405,7 @@ Build-Date: ${build.tstamp}
@@ -424,6 +406,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
......@@ -203,7 +203,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -985,6 +968,7 @@ Build-Date: ${build.tstamp}
@@ -996,6 +979,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
......
......@@ -7,17 +7,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/actions/AboutAction.java
+++ b/src/org/openstreetmap/josm/actions/AboutAction.java
@@ -16,6 +16,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -92,6 +95,8 @@ public final class AboutAction extends J
@@ -102,6 +102,8 @@ public final class AboutAction extends J
"<p style='font-size:75%'></p>" +
"<p>" + tr("Version {0}", version.getVersionString()) + "</p>" +
"<p style='font-size:50%'></p>" +
......@@ -25,7 +15,7 @@ Forwarded: not-needed
+ "<p style='font-size:50%'></p>" +
"<p>" + tr("Last change at {0}", version.getTime()) + "</p>" +
"<p style='font-size:50%'></p>" +
"<p>" + tr("Java Version {0}", Utils.getSystemProperty("java.version")) + "</p>" +
"<p>" + tr("Java Version {0}", getSystemProperty("java.version")) + "</p>" +
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -40,6 +40,7 @@ public class Version {
......@@ -58,23 +48,23 @@ Forwarded: not-needed
*
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -41,6 +41,7 @@ import org.openstreetmap.josm.plugins.Pl
@@ -40,6 +40,7 @@ import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.plugins.PluginHandler;
import org.openstreetmap.josm.spi.preferences.Config;
import org.openstreetmap.josm.spi.preferences.Setting;
import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.PlatformManager;
import org.openstreetmap.josm.tools.Shortcut;
@@ -302,7 +303,7 @@ public final class ShowStatusReportActio
@@ -305,7 +306,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: ta.copyToClipboard(); break;
- case 2: BugReportSender.reportBug(reportHeader); break;
+ case 2: OpenBrowser.displayUrl("https://bugs.debian.org/"); break;
default: // Do nothing
default: // do nothing
}
}
GuiHelper.destroyComponents(ed, false);
--- a/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
+++ b/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
@@ -93,7 +93,8 @@ public class BugReportDialog extends JDi
......@@ -118,7 +108,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
@@ -89,9 +89,7 @@ public class BugReportSender extends Thr
@@ -88,9 +88,7 @@ public class BugReportSender extends Thr
@Override
public void run() {
try {
......@@ -129,7 +119,7 @@ Forwarded: not-needed
// then notify handler
errorMessage = handler.sendingBugReport(bugUrl, statusText);
@@ -99,7 +97,7 @@ public class BugReportSender extends Thr
@@ -98,7 +96,7 @@ public class BugReportSender extends Thr
Logging.warn(errorMessage);
handler.failed(errorMessage, statusText);
}
......@@ -138,7 +128,7 @@ Forwarded: not-needed
Logging.warn(e);
errorMessage = e.getMessage();
handler.failed(errorMessage, statusText);
@@ -135,7 +133,7 @@ public class BugReportSender extends Thr
@@ -134,7 +132,7 @@ public class BugReportSender extends Thr
}
private static String getJOSMTicketURL() {
......
......@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -211,7 +211,6 @@ Debian-Release: ${debian.version}
@@ -212,7 +212,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -196,7 +196,7 @@ Debian-Release: ${debian.version}
@@ -197,7 +197,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"/>
......
......@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -208,9 +208,6 @@ Debian-Release: ${debian.version}
@@ -209,9 +209,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" />
......@@ -26,7 +26,7 @@ Forwarded: not-needed
import java.nio.charset.StandardCharsets;
import java.nio.file.InvalidPathException;
import java.text.MessageFormat;
@@ -325,7 +326,11 @@ public final class I18n {
@@ -326,7 +327,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment