[josm] 04/05: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Sun Sep 3 09:35:07 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 2d88a4851f62eeb347cb1c06c5f107df8f16713b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 3 11:23:02 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 68 ++++++++++++++-------------
debian/patches/01-bts.patch | 38 +++++++--------
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 10 ++--
6 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6a2dc1b..6a37da7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
josm (0.0.svn12712+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Sun, 03 Sep 2017 10:57:43 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index ee48928..1e5c5ae 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -9,17 +9,17 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -24,7 +24,8 @@
- <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
+@@ -25,7 +25,8 @@
<property name="proj-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="groovy.jar" location="${base.dir}/tools/groovy-all.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.jar"/>
- <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
- <!-- build parameter: compression level (ant -Dclevel=N)
-@@ -37,6 +38,19 @@
+ <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
+ <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
+@@ -41,6 +42,19 @@
<condition property="isJava9">
<matches string="${ant.java.version}" pattern="(1.)?9" />
</condition>
@@ -39,7 +39,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
-@@ -97,10 +111,9 @@
+@@ -101,10 +115,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>
-@@ -111,8 +124,10 @@
+@@ -115,8 +128,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -64,16 +64,16 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -132,7 +147,7 @@ Build-Date: ${build.tstamp}
- <copy file="README" todir="build"/>
- <copy file="LICENSE" todir="build"/>
+@@ -136,7 +151,7 @@ Build-Date: ${build.tstamp}
+ <copy file="README" todir="${build.dir}"/>
+ <copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
-- <delete file="${dist.dir}/josm-custom.jar"/>
+- <delete file="${dist.jar}"/>
+ <propertyregex property="classpathprop" input="${classpathprop-colon}" global="true" regexp=":" replace=" "/>
- <jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}">
+ <jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -142,6 +157,8 @@ Build-Date: ${build.tstamp}
+@@ -146,6 +161,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"/>
@@ -82,7 +82,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/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}
+@@ -219,42 +236,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -91,18 +91,18 @@ Forwarded: not-needed
+ <exec append="false" executable="javacc" failifexecutionfails="true">
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
- <arg value="-JDK_VERSION=1.8"/>
+ <arg value="-JDK_VERSION=${java.lang.version}"/>
<arg value="-GRAMMAR_ENCODING=UTF-8"/>
<arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
<arg value="${mapcss.dir}/MapCSSParser.jj"/>
- </java>
+ </exec>
</target>
- <target name="compile" depends="init,javacc">
+ <target name="compile-cots" depends="init">
<!-- COTS -->
-- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
-+ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
- destdir="build" target="1.8" source="1.8" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
+- <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
++ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
+ destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" 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"/>
@@ -128,7 +128,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"/>
-@@ -271,19 +267,13 @@ Build-Date: ${build.tstamp}
+@@ -275,21 +271,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/**"/>
@@ -140,36 +140,40 @@ Forwarded: not-needed
</javac>
+ <!-- I18N -->
+ <ant dir="i18n" />
+ </target>
+ <target name="compile-jmapviewer" depends="init">
<!-- JMapViewer -->
- <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
-+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
- excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
- destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
+ excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
+ destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerclasspath>
- <pathelement location="${error_prone_ant.jar}"/>
- </compilerclasspath>
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -297,16 +287,12 @@ Build-Date: ${build.tstamp}
+@@ -303,18 +293,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"/>
- <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
+ </target>
+ <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
<!-- JOSM -->
-- <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
-+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
- excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
- destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+- <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
+ excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
+ destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerclasspath>
- <pathelement location="${error_prone_ant.jar}"/>
- </compilerclasspath>
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -320,12 +306,6 @@ Build-Date: ${build.tstamp}
+@@ -328,12 +314,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"/>
@@ -182,7 +186,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -339,6 +319,7 @@ Build-Date: ${build.tstamp}
+@@ -347,6 +327,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -190,7 +194,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -370,6 +351,7 @@ Build-Date: ${build.tstamp}
+@@ -379,6 +360,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}"/>
@@ -198,7 +202,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -839,6 +821,7 @@ Build-Date: ${build.tstamp}
+@@ -856,6 +838,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 12b4fee..7403230 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -17,7 +17,7 @@ Forwarded: not-needed
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
-@@ -84,6 +87,8 @@ public final class AboutAction extends J
+@@ -86,6 +89,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>" +
@@ -26,7 +26,7 @@ Forwarded: not-needed
"<p>" + tr("Last change at {0}", version.getTime()) + "</p>" +
"<p style='font-size:50%'></p>" +
"<p>" + tr("Java Version {0}", System.getProperty("java.version")) + "</p>" +
-@@ -93,6 +98,7 @@ public final class AboutAction extends J
+@@ -95,6 +100,7 @@ public final class AboutAction extends J
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10, 0, 10, 0));
info.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eol().fill(GBC.HORIZONTAL));
info.add(GBC.glue(0, 5), GBC.eol());
@@ -36,7 +36,7 @@ Forwarded: not-needed
about.addTab(tr("Readme"), createScrollPane(readme));
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
-@@ -38,6 +38,7 @@ public class Version {
+@@ -39,6 +39,7 @@ public class Version {
private int version;
private String releaseDescription;
@@ -44,7 +44,7 @@ Forwarded: not-needed
private String time;
private String buildName;
private boolean isLocalBuild;
-@@ -73,6 +74,8 @@ public class Version {
+@@ -74,6 +75,8 @@ public class Version {
version = JOSM_UNKNOWN_VERSION;
}
@@ -53,7 +53,7 @@ Forwarded: not-needed
// the last changed data
//
time = properties.getProperty("Last Changed Date");
-@@ -125,6 +128,10 @@ public class Version {
+@@ -126,6 +129,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
@@ -66,15 +66,15 @@ Forwarded: not-needed
*
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -36,6 +36,7 @@ import org.openstreetmap.josm.gui.prefer
- import org.openstreetmap.josm.gui.util.GuiHelper;
+@@ -38,6 +38,7 @@ import org.openstreetmap.josm.gui.util.G
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.plugins.PluginHandler;
+ import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
-@@ -298,7 +299,7 @@ public final class ShowStatusReportActio
+@@ -299,7 +300,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: ta.copyToClipboard(); break;
@@ -83,9 +83,9 @@ Forwarded: not-needed
default: // Do nothing
}
}
---- a/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
-+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
-@@ -90,7 +90,8 @@ public class BugReportDialog extends JDi
+--- 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
private void addMessageSection() {
String message = tr(
"An unexpected exception occurred.\n" + "This is always a coding error. If you are running the latest "
@@ -95,7 +95,7 @@ Forwarded: not-needed
Icon icon = UIManager.getIcon("OptionPane.errorIcon");
JPanel panel = new JPanel(new GridBagLayout());
-@@ -108,7 +109,7 @@ public class BugReportDialog extends JDi
+@@ -111,7 +112,7 @@ public class BugReportDialog extends JDi
panel.add(textPanel, GBC.eop().fill());
panel.add(new JLabel(tr("Manually report at:")+' '), GBC.std());
@@ -104,7 +104,7 @@ Forwarded: not-needed
JButton copy = new JButton("Copy to clipboard");
copy.addActionListener(e -> textPanel.copyToClipboard());
panel.add(copy, GBC.eol().anchor(GBC.EAST));
-@@ -128,8 +129,7 @@ public class BugReportDialog extends JDi
+@@ -131,8 +132,7 @@ public class BugReportDialog extends JDi
JMultilineLabel helpText = new JMultilineLabel(
tr("If you are running the latest version of JOSM and the plugins, "
+ "please file a bug report in our bugtracker.\n"
@@ -114,7 +114,7 @@ Forwarded: not-needed
+ "the error and try to supply as much detail as possible."));
helpText.setMaxWidth(MAX_MESSAGE_SIZE);
panel.add(helpText, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
-@@ -141,9 +141,6 @@ public class BugReportDialog extends JDi
+@@ -144,9 +144,6 @@ public class BugReportDialog extends JDi
}
panel.add(settings);
@@ -126,7 +126,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
-@@ -57,16 +57,13 @@ public class BugReportSender extends Thr
+@@ -59,16 +59,13 @@ public class BugReportSender extends Thr
@Override
public void run() {
try {
@@ -138,15 +138,15 @@ Forwarded: not-needed
+ // open a browser to https://bugs.debian.org/
+ String openBrowserError = OpenBrowser.displayUrl(getJOSMTicketURL());
if (openBrowserError != null) {
- Main.warn(openBrowserError);
+ Logging.warn(openBrowserError);
failed(openBrowserError);
}
- } catch (BugReportSenderException e) {
+ } catch (Exception e) {
- Main.warn(e);
+ Logging.warn(e);
failed(e.getMessage());
}
-@@ -101,7 +98,7 @@ public class BugReportSender extends Thr
+@@ -103,7 +100,7 @@ public class BugReportSender extends Thr
}
private static String getJOSMTicketURL() {
@@ -155,7 +155,7 @@ Forwarded: not-needed
}
private static String retrieveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException {
-@@ -132,7 +129,7 @@ public class BugReportSender extends Thr
+@@ -134,7 +131,7 @@ public class BugReportSender extends Thr
errorPanel.add(new JMultilineLabel(
tr("Opening the bug report failed. Please report manually using this website:")),
GBC.eol().fill(GridBagConstraints.HORIZONTAL));
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 00e99e3..e3e93aa 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
-@@ -166,7 +166,6 @@ Debian-Release: ${debian.version}
+@@ -170,7 +170,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 ae2009d..961cd39 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
-@@ -152,7 +152,7 @@ Debian-Release: ${debian.version}
+@@ -156,7 +156,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 725e9f2..07b36bf 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -163,9 +163,9 @@ Debian-Release: ${debian.version}
+@@ -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" />
</manifest>
@@ -21,7 +21,7 @@ Forwarded: not-needed
<!-- Mac OS X target -->
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
-@@ -10,6 +10,7 @@ import java.io.InputStream;
+@@ -9,6 +9,7 @@ import java.io.InputStream;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.net.URL;
@@ -29,11 +29,11 @@ Forwarded: not-needed
import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.ArrayList;
-@@ -362,7 +363,11 @@ public final class I18n {
+@@ -268,7 +269,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
-- return Main.class.getResource("/data/"+lang.replace('@', '-')+".lang");
+- return I18n.class.getResource("/data/"+lang.replace('@', '-')+".lang");
+ try {
+ return new URL("file:///usr/share/josm/data/"+lang.replace('@', '-')+".lang");
+ } catch (MalformedURLException ex) {
@@ -44,7 +44,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -206,11 +206,17 @@ public class CachedFile implements Close
+@@ -207,11 +207,17 @@ public class CachedFile implements Close
File file = getFile();
if (file == null) {
if (name != null && name.startsWith("resource://")) {
--
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