[josm] 04/05: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Mon Nov 7 07:22:03 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 74572524dc3f3f805b9b4c34cc4f120d0b1c8d94
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Nov 7 07:56:27 2016 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 4 +--
debian/patches/01-bts.patch | 12 ++++-----
debian/patches/02-elemstyles.patch | 2 +-
debian/patches/03-default_look_and_feel.patch | 4 +--
debian/patches/06-move_data_out_of_jar.patch | 36 ---------------------------
debian/patches/08-use_noto_font.patch | 2 +-
7 files changed, 13 insertions(+), 48 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 73abab0..960a3ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn11223+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Use the Debian BTS instead of JOSM Trac in BugReportSender class.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Mon, 07 Nov 2016 07:47:22 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index ec615c1..1790eee 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.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-2.0.12.jar"/>
+ <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.13.jar"/>
<property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
<!-- build parameter: compression level (ant -Dclevel=N)
@@ -37,6 +38,19 @@
@@ -183,7 +183,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -767,6 +760,7 @@ Build-Date: ${build.tstamp}
+@@ -769,6 +762,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 7a1d6df..affbbb2 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -77,7 +77,7 @@ Forwarded: not-needed
@@ -294,7 +295,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
- case 1: ta.copyToClippboard(); break;
+ case 1: ta.copyToClipboard(); break;
- case 2: BugReportSender.reportBug(reportHeader); break;
+ case 2: OpenBrowser.displayUrl("https://bugs.debian.org/"); break;
default: // Do nothing
@@ -98,11 +98,11 @@ Forwarded: not-needed
@@ -108,7 +109,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 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());
+ copy.addActionListener(e -> textPanel.copyToClipboard());
panel.add(copy, GBC.eol().anchor(GBC.EAST));
@@ -128,8 +129,7 @@ public class BugReportDialog extends JDi
JMultilineLabel helpText = new JMultilineLabel(
@@ -114,13 +114,13 @@ 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));
-@@ -139,9 +139,6 @@ public class BugReportDialog extends JDi
- panel.add(new BugReportSettingsPanel(report), GBC.eop().fill(GBC.HORIZONTAL));
+@@ -141,9 +141,6 @@ public class BugReportDialog extends JDi
}
+ panel.add(settings);
- JButton sendBugReportButton = new JButton(tr("Report Bug"), ImageProvider.get("bug"));
- sendBugReportButton.addActionListener(e -> sendBug());
-- panel.add(sendBugReportButton, GBC.eop().anchor(GBC.EAST));
+- panel.add(sendBugReportButton, GBC.eol().insets(0, 0, 0, 0).anchor(GBC.SOUTHEAST));
content.add(panel, GBC.eop().fill(GBC.HORIZONTAL));
}
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 7a30338..3970ef8 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -254,11 +254,19 @@ public final class MapPaintStyles {
+@@ -257,11 +257,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/");
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index b9c10e8..61fc1d9 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
-@@ -168,7 +168,7 @@ public class PlatformHookUnixoid impleme
+@@ -80,7 +80,7 @@ public class PlatformHookUnixoid impleme
@Override
public String getDefaultStyle() {
@@ -14,4 +14,4 @@ Forwarded: not-needed
+ return "javax.swing.plaf.gtk.GTKLookAndFeel";
}
- @Override
+ /**
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 17177f4..f3eb8b4 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -67,39 +67,3 @@ Forwarded: not-needed
} else {
throw new IOException("No file found for: "+name);
}
---- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
-+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
-@@ -15,6 +15,7 @@ import java.awt.event.WindowAdapter;
- import java.awt.event.WindowEvent;
- import java.io.BufferedReader;
- import java.io.IOException;
-+import java.io.InputStream;
- import java.io.InputStreamReader;
- import java.io.StringReader;
- import java.nio.charset.StandardCharsets;
-@@ -49,6 +50,7 @@ import org.openstreetmap.josm.gui.HelpAw
- import org.openstreetmap.josm.gui.MainMenu;
- import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
- import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
-+import org.openstreetmap.josm.io.CachedFile;
- import org.openstreetmap.josm.tools.ImageProvider;
- import org.openstreetmap.josm.tools.InputMapUtils;
- import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
-@@ -139,11 +141,12 @@ public class HelpBrowser extends JDialog
- protected StyleSheet buildStyleSheet() {
- StyleSheet ss = new StyleSheet();
- StringBuilder css = new StringBuilder();
-- try (BufferedReader breader = new BufferedReader(
-- new InputStreamReader(
-- getClass().getResourceAsStream("/data/help-browser.css"), StandardCharsets.UTF_8
-- )
-- )) {
-+ try (CachedFile cf = new CachedFile("resource://data/help-browser.css");
-+ InputStream cssStream = cf.getInputStream();
-+ BufferedReader breader = new BufferedReader(
-+ new InputStreamReader(cssStream, StandardCharsets.UTF_8)
-+ )
-+ ) {
- String line;
- while ((line = breader.readLine()) != null) {
- css.append(line);
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 63ec8c8..497b505 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
-@@ -1549,7 +1549,7 @@ public class StyledMapRenderer extends A
+@@ -1556,7 +1556,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