[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4667+dfsg1-2-9-g3d26fa5
David Paleino
dapal at debian.org
Thu Feb 2 10:58:55 UTC 2012
The following commit has been merged in the master branch:
commit 284873b21cc863b1c68bde9f8ce62aec663c0e69
Author: David Paleino <dapal at debian.org>
Date: Thu Feb 2 11:11:27 2012 +0100
Patches refreshed
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 0e9a3e0..e791dd8 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -74,40 +74,40 @@ bug triaging.
*
--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -82,8 +82,8 @@ public final class BugReportExceptionHan
- pnl.add(new JLabel(
- "<html>"
- + 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.\n" +
-+ "See http://bugs.debian.org for a guide how to do this."
- )
- + "</html>"), GBC.eol());
- JCheckBox cbSuppress = null;
-@@ -122,21 +122,13 @@ public final class BugReportExceptionHan
+@@ -83,8 +83,8 @@ public final class BugReportExceptionHan
+ pnl.add(new JLabel(
+ "<html>"
+ + 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 http://bugs.debian.org for a guide how to do this."
+ )
+ + "</html>"), GBC.eol());
+ JCheckBox cbSuppress = null;
+@@ -123,21 +123,13 @@ 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());
-- p.add(new UrlLabel("http://josm.openstreetmap.de/#Download"), 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());
-- p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
-+ tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol());
- 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());
-+ 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());
-- p.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eop().insets(8,0,0,0));
-+ tr("Be sure to include the following information:")), GBC.eop());
- if (Utils.copyToClipboard(text)) {
- p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
- }
+ 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());
+- p.add(new UrlLabel("http://josm.openstreetmap.de/#Download"), 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());
+- p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
++ tr("Include your steps to get to the error (as detailed as possible)!")), GBC.eol());
+ 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());
++ 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());
+- p.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eop().insets(8,0,0,0));
++ tr("Be sure to include the following information:")), GBC.eop());
+ if (Utils.copyToClipboard(text)) {
+ p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop());
+ }
diff --git a/debian/patches/40-elemstyles.patch b/debian/patches/40-elemstyles.patch
index 66cc9f2..613b87b 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -14,7 +14,7 @@ applications. This patch points josm to the shared directories.
--- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -134,14 +134,19 @@ public class MapPaintStyles {
+@@ -155,14 +155,19 @@ public class MapPaintStyles {
}
if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -48,7 +48,7 @@ applications. This patch points josm to the shared directories.
import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
@@ -1060,8 +1061,16 @@ public class TaggingPreset extends Abstr
- ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName, zipIcons);
+ ImageIcon icon = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true).get();
if (icon == null)
{
- System.out.println("Could not get presets icon " + iconName);
diff --git a/debian/patches/70-default_look_and_feel.patch b/debian/patches/70-default_look_and_feel.patch
index 80fe671..6af54bd 100644
--- a/debian/patches/70-default_look_and_feel.patch
+++ b/debian/patches/70-default_look_and_feel.patch
@@ -9,11 +9,9 @@ Patch rewritten for new code, original patch was from Ubuntu's
src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-===================================================================
---- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java 2011-08-06 22:49:15.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java 2011-08-07 01:11:41.000000000 +0200
-@@ -77,7 +77,7 @@
+--- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
++++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+@@ -80,7 +80,7 @@ public class PlatformHookUnixoid impleme
}
public String getDefaultStyle() {
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index acda523..0d3c025 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
--- josm.orig/data/defaultpresets.xml
+++ josm/data/defaultpresets.xml
-@@ -2918,7 +2918,7 @@ are supplied, then "values" will be trea
+@@ -2955,7 +2955,7 @@ are supplied, then "values" will be trea
<key key="amenity" value="theatre" />
<text key="name" text="Name" default="" delete_if_empty="true" />
</item>
@@ -18,7 +18,7 @@ Forwarded: not-needed
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library"
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library"
-@@ -3222,7 +3222,7 @@ are supplied, then "values" will be trea
+@@ -3259,7 +3259,7 @@ are supplied, then "values" will be trea
<space />
</item>
<separator/>
--
Editor for OpenStreetMap
More information about the Pkg-osm-commits
mailing list