[josm] 08/12: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Fri Aug 12 14:29:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 9cea0647d4bb1e6c32f2d945545873c675891575
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Aug 12 15:16:28 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 66 +++++++++++++------
debian/patches/01-bts.patch | 93 +++++++++++++--------------
debian/patches/02-elemstyles.patch | 29 ++++-----
debian/patches/03-default_look_and_feel.patch | 2 +-
debian/patches/08-use_noto_font.patch | 2 +-
6 files changed, 107 insertions(+), 86 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index abdaa1a..2f9e9a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ josm (0.0.svn10786+dfsg-1) UNRELEASED; urgency=medium
* Switch more URLs to HTTPS.
* Bump minimum required openstreetmap-map-icons-classic to 1:0.0.svn32805.
* Bump minimum required jmapviewer version to 2.0.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 12 Aug 2016 13:31:52 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index f0d9daf..d8e5841 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -9,17 +9,19 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -24,7 +24,8 @@
+@@ -24,9 +24,8 @@
<property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
<property name="proj-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-2.4.7.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.11.jar"/>
+- <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
+ <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/>
++ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
-@@ -35,6 +36,19 @@
+@@ -37,6 +36,19 @@
<condition property="isJava9">
<equals arg1="${ant.java.version}" arg2="1.9" />
</condition>
@@ -39,7 +41,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
-@@ -90,10 +104,9 @@
+@@ -92,10 +104,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -52,7 +54,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -104,8 +117,10 @@
+@@ -106,8 +117,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -64,7 +66,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -125,7 +140,7 @@ Build-Date: ${build.tstamp}
+@@ -127,7 +140,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -73,7 +75,7 @@ Forwarded: not-needed
<jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -135,6 +150,8 @@ Build-Date: ${build.tstamp}
+@@ -137,6 +150,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 +84,7 @@ Forwarded: not-needed
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -205,10 +222,7 @@ Build-Date: ${build.tstamp}
+@@ -207,10 +222,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -93,14 +95,14 @@ 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.7"/>
-@@ -219,31 +233,19 @@ Build-Date: ${build.tstamp}
+ <arg value="-JDK_VERSION=1.8"/>
+@@ -221,36 +233,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile" depends="init,javacc">
<!-- 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.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
+ 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/compressors/lzma/**"/>
@@ -125,21 +127,43 @@ Forwarded: not-needed
+ <!-- I18N -->
+ <ant dir="i18n" />
<!-- JMapViewer -->
-- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
-+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
- destdir="build" target="1.7" source="1.7" 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/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
+ destdir="build" target="1.8" source="1.8" 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"/>
-@@ -260,7 +262,7 @@ Build-Date: ${build.tstamp}
+ <compilerarg value="-Xlint:dep-ann"/>
+@@ -264,16 +261,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"/>
+- <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+ <compilerarg line="-Xmaxwarns 1000"/>
</javac>
<!-- JOSM -->
-- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
-+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
- destdir="build" target="1.7" source="1.7" 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/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
+ destdir="build" target="1.8" source="1.8" 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"/>
-@@ -287,6 +289,7 @@ Build-Date: ${build.tstamp}
+ <compilerarg value="-Xlint:dep-ann"/>
+@@ -287,7 +280,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"/>
+- <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+ <compilerarg line="-Xmaxwarns 1000"/>
+ </javac>
+
+@@ -301,6 +293,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -147,7 +171,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -312,6 +315,7 @@ Build-Date: ${build.tstamp}
+@@ -326,6 +319,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}"/>
@@ -155,7 +179,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -716,6 +720,7 @@ Build-Date: ${build.tstamp}
+@@ -731,6 +725,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 a7f7dc9..7437a05 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;
-@@ -82,6 +85,8 @@ public final class AboutAction extends J
+@@ -84,6 +87,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>" +
-@@ -91,6 +96,7 @@ public final class AboutAction extends J
+@@ -93,6 +98,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());
@@ -64,59 +64,17 @@ Forwarded: not-needed
/**
* Replies a text with the release attributes
*
---- a/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java
-+++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java
-@@ -82,8 +82,8 @@ public final class BugReportExceptionHan
- String[] buttonIcons = new String[] {"cancel", "bug"};
- int defaultButtonIdx = 1;
- String message = tr("An unexpected exception occurred.<br>" +
-- "This is always a coding error. If you are running the latest<br>" +
-- "version of JOSM, please consider being kind and file a bug report."
-+ "Please consider being kind and file a bug report.<br>" +
-+ "See https://bugs.debian.org/ for a guide how to do this."
- );
- // Check user is running current tested version, the error may already be fixed
- int josmVersion = Version.getInstance().getVersion();
-@@ -211,24 +211,14 @@ public final class BugReportExceptionHan
-
- JPanel p = new JPanel(new GridBagLayout());
- p.add(new JMultilineLabel(
-- tr("You have encountered an error in JOSM. Before you file a bug report " +
-- "make sure you have updated to the latest version of JOSM here:")),
-- GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-- p.add(new UrlLabel(Main.getJOSMWebsite(), 2), GBC.eop().insets(8, 0, 0, 0));
-+ tr("Please report a bug against JOSM.")), GBC.eol());
- p.add(new JMultilineLabel(
-- tr("You should also update your plugins. If neither of those help please " +
-- "file a bug report in our bugtracker using this link:")),
-- GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-+ tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol());
- p.add(new JButton(new ReportBugAction(text)), GBC.eop().insets(8, 0, 0, 0));
- p.add(new JMultilineLabel(
-- tr("There the error information provided below should already be " +
-- "filled in for you. Please include information on how to reproduce " +
-- "the error and try to supply as much detail as possible.")),
-- GBC.eop().fill(GridBagConstraints.HORIZONTAL));
-+ tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.")), GBC.eol());
- p.add(new JMultilineLabel(
-- tr("Alternatively, if that does not work you can manually fill in the information " +
-- "below at this URL:")), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
-- p.add(new UrlLabel(Main.getJOSMWebsite()+"/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-+ tr("Be sure to include the following information:")), GBC.eop());
-
- // Wiki formatting for manual copy-paste
- DebugTextDisplay textarea = new DebugTextDisplay(text);
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -34,6 +34,7 @@ import org.openstreetmap.josm.gui.prefer
+@@ -32,6 +32,7 @@ import org.openstreetmap.josm.gui.prefer
import org.openstreetmap.josm.gui.preferences.validator.ValidatorTagCheckerRulesPreference;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.OpenBrowser;
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
- import org.openstreetmap.josm.tools.bugreport.BugReportSender;
-@@ -268,7 +269,7 @@ public final class ShowStatusReportActio
+ import org.openstreetmap.josm.tools.Utils;
+@@ -273,7 +274,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: ta.copyToClippboard(); break;
@@ -125,3 +83,44 @@ Forwarded: not-needed
default: // Do nothing
}
}
+--- a/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
++++ b/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
+@@ -86,7 +86,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 "
+- + "version of JOSM, please consider being kind and file a bug report.");
++ + "version of JOSM, please consider being kind and file a bug report."
++ + "See https://bugs.debian.org/ for a guide how to do this.");
+ Icon icon = UIManager.getIcon("OptionPane.errorIcon");
+
+ JPanel panel = new JPanel(new GridBagLayout());
+@@ -104,7 +105,7 @@ public class BugReportDialog extends JDi
+ panel.add(textPanel, GBC.eop().fill());
+
+ panel.add(new JLabel(tr("Manually report at:")), GBC.std());
+- panel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket"), GBC.std().fill(GBC.HORIZONTAL));
++ panel.add(new UrlLabel("https://bugs.debian.org/"), GBC.std().fill(GBC.HORIZONTAL));
+ JButton copy = new JButton("Copy to clipboard");
+ copy.addActionListener(e -> textPanel.copyToClippboard());
+ panel.add(copy, GBC.eol().anchor(GBC.EAST));
+@@ -124,8 +125,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"
+- + "There the error information should already be "
+- + "filled in for you. Please include information on how to reproduce "
++ + "Please include information on how to reproduce "
+ + "the error and try to supply as much detail as possible."));
+ helpText.setMaxWidth(MAX_MESSAGE_SIZE);
+ panel.add(helpText, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
+@@ -135,9 +135,6 @@ public class BugReportDialog extends JDi
+ panel.add(new BugReportSettingsPanel(report), GBC.eop().fill(GBC.HORIZONTAL));
+ }
+
+- JButton sendBugReportButton = new JButton(tr("Report Bug"), ImageProvider.get("bug"));
+- sendBugReportButton.addActionListener(e -> sendBug());
+- panel.add(sendBugReportButton, GBC.eop().anchor(GBC.EAST));
+ content.add(panel, GBC.eop().fill(GBC.HORIZONTAL));
+ }
+
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index f6058fa..74b108f 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -7,13 +7,10 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -239,14 +239,19 @@ public final class MapPaintStyles {
- }
-
+@@ -241,11 +241,19 @@ public final class MapPaintStyles {
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
-- /* don't prefix icon path, as it should be generic */
-- dirs.add("resource://images/styles/standard/");
-- dirs.add("resource://images/styles/");
+ /* don't prefix icon path, as it should be generic */
+ dirs.add("resource://images/");
+ addDebianDirs(dirs);
}
@@ -32,7 +29,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
-@@ -46,6 +46,7 @@ import org.openstreetmap.josm.gui.Notifi
+@@ -47,6 +47,7 @@ import org.openstreetmap.josm.gui.Notifi
import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
@@ -40,7 +37,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
import org.openstreetmap.josm.gui.tagging.presets.items.Key;
import org.openstreetmap.josm.gui.tagging.presets.items.Label;
-@@ -178,8 +179,15 @@ public class TaggingPreset extends Abstr
+@@ -196,8 +197,15 @@ public class TaggingPreset extends Abstr
return;
}
File arch = TaggingPresetReader.getZipIcons();
@@ -58,15 +55,15 @@ Forwarded: not-needed
imgProv.setDirs(s);
imgProv.setId("presets");
imgProv.setArchive(arch);
-@@ -195,7 +203,7 @@ public class TaggingPreset extends Abstr
- }
- });
- } else {
-- Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
-+ Main.warn(TaggingPreset.this + ": " + PRESET_ICON_ERROR_MSG_PREFIX + realIconName);
- }
+@@ -206,7 +214,7 @@ public class TaggingPreset extends Abstr
+ if (result != null) {
+ GuiHelper.runInEDT(() -> result.attachImageIcon(this));
+ } else {
+- Main.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
++ Main.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + realIconName);
}
});
+ }
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
@@ -9,6 +9,7 @@ import java.util.Arrays;
@@ -85,7 +82,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
import org.openstreetmap.josm.tools.ImageProvider;
-@@ -126,12 +128,22 @@ public abstract class TaggingPresetItem
+@@ -124,12 +126,22 @@ public abstract class TaggingPresetItem
}
protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index 44d0e5c..b9c10e8 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
-@@ -185,7 +185,7 @@ public class PlatformHookUnixoid impleme
+@@ -168,7 +168,7 @@ public class PlatformHookUnixoid impleme
@Override
public String getDefaultStyle() {
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 21cbd1c..c61deb6 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/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
-@@ -1566,7 +1566,7 @@ public class StyledMapRenderer extends A
+@@ -1551,7 +1551,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
--
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