The following commit has been merged in the master branch:
commit c040ce4e067f12faec6891a426d431eaa54d198f
Author: David Paleino <da...@debian.org>
Date:   Sun Sep 25 08:16:50 2011 +0200

    Patches refreshed

diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 62e4b40..945c091 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -9,14 +9,12 @@ bug triaging.
 ---
  src/org/openstreetmap/josm/actions/AboutAction.java             |    7 +++
  src/org/openstreetmap/josm/data/Version.java                    |    7 +++
- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   19 
+++-------
- 3 files changed, 19 insertions(+), 14 deletions(-)
+ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   20 
+++-------
+ 3 files changed, 19 insertions(+), 15 deletions(-)
 
-Index: josm/src/org/openstreetmap/josm/actions/AboutAction.java
-===================================================================
---- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java      
2011-06-16 11:10:23.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/actions/AboutAction.java   2011-08-07 
01:03:09.000000000 +0200
-@@ -9,6 +9,9 @@
+--- josm.orig/src/org/openstreetmap/josm/actions/AboutAction.java
++++ josm/src/org/openstreetmap/josm/actions/AboutAction.java
+@@ -9,6 +9,9 @@ import java.awt.GridBagLayout;
  import java.awt.event.ActionEvent;
  import java.awt.event.KeyEvent;
  
@@ -26,7 +24,7 @@ Index: 
josm/src/org/openstreetmap/josm/actions/AboutAction.java
  import javax.swing.BorderFactory;
  import javax.swing.JLabel;
  import javax.swing.JOptionPane;
-@@ -63,6 +66,8 @@
+@@ -63,6 +66,8 @@ public class AboutAction extends JosmAct
          info.add(GBC.glue(0,10), GBC.eol());
          info.add(new JLabel(tr("Version {0}", version.getVersionString())), 
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
          info.add(GBC.glue(0,5), GBC.eol());
@@ -35,7 +33,7 @@ Index: 
josm/src/org/openstreetmap/josm/actions/AboutAction.java
          info.add(new JLabel(tr("Last change at {0}",version.getTime())), 
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
          info.add(GBC.glue(0,5), GBC.eol());
          info.add(new JLabel(tr("Java Version 
{0}",System.getProperty("java.version"))), 
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
-@@ -70,7 +75,7 @@
+@@ -70,7 +75,7 @@ public class AboutAction extends JosmAct
          info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0));
          info.add(new UrlLabel("http://josm.openstreetmap.de";), 
GBC.eol().fill(GBC.HORIZONTAL));
          info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
@@ -44,11 +42,9 @@ Index: 
josm/src/org/openstreetmap/josm/actions/AboutAction.java
  
          JTextArea revision = new JTextArea();
          revision.setEditable(false);
-Index: josm/src/org/openstreetmap/josm/data/Version.java
-===================================================================
---- josm.orig/src/org/openstreetmap/josm/data/Version.java     2011-08-06 
22:49:15.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/data/Version.java  2011-08-07 
01:04:13.000000000 +0200
-@@ -66,6 +66,7 @@
+--- josm.orig/src/org/openstreetmap/josm/data/Version.java
++++ josm/src/org/openstreetmap/josm/data/Version.java
+@@ -66,6 +66,7 @@ public class Version {
  
      private int version;
      private String releaseDescription;
@@ -56,7 +52,7 @@ Index: josm/src/org/openstreetmap/josm/data/Version.java
      private String time;
      private boolean isLocalBuild;
  
-@@ -115,6 +116,8 @@
+@@ -115,6 +116,8 @@ public class Version {
              version = JOSM_UNKNOWN_VERSION;
          }
  
@@ -65,7 +61,7 @@ Index: josm/src/org/openstreetmap/josm/data/Version.java
          // the last changed data
          //
          time = properties.get("Last Changed Date");
-@@ -160,6 +163,10 @@
+@@ -160,6 +163,10 @@ public class Version {
          return  version == 0 ? tr("UNKNOWN") : Integer.toString(version);
      }
  
@@ -76,11 +72,9 @@ Index: josm/src/org/openstreetmap/josm/data/Version.java
      /**
       * Replies a text with the release attributes
       *
-Index: josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-===================================================================
---- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java  
2011-06-16 11:10:23.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java       
2011-08-07 01:03:09.000000000 +0200
-@@ -75,8 +75,8 @@
+--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
++++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+@@ -70,8 +70,8 @@ public final class BugReportExceptionHan
                          Main.parent,
                          "<html>"
                          + tr("An unexpected exception occurred.<br>" +
@@ -91,7 +85,7 @@ Index: 
josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
                          )
                          + "</html>",
                          tr("Unexpected Exception"),
-@@ -111,21 +111,14 @@
+@@ -106,21 +106,13 @@ public final class BugReportExceptionHan
  
                      JPanel p = new JPanel(new GridBagLayout());
                      p.add(new JMultilineLabel(
@@ -102,8 +96,8 @@ Index: 
josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
                      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 UrlLabel(url.toString(), 
"http://josm.openstreetmap.de/josmticket?...";), 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 " +
@@ -114,6 +108,6 @@ Index: 
josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
 -                            "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());
-                     try {
-                         
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new 
StringSelection(text), new ClipboardOwner(){
-                             public void lostOwnership(Clipboard clipboard, 
Transferable contents) {}
+                     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 b7df07b..71a1a5d 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -12,11 +12,9 @@ applications. This patch points josm to the shared 
directories.
  src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java   |   13 
++++++++++--
  2 files changed, 19 insertions(+), 5 deletions(-)
 
-Index: josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-===================================================================
---- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java      
2011-08-06 22:49:15.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java   
2011-08-07 01:05:02.000000000 +0200
-@@ -134,14 +134,19 @@
+--- 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 {
          }
  
          if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -39,11 +37,9 @@ Index: 
josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
      public static void readFromPreferences() {
          styles.clear();
  
-Index: josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-===================================================================
---- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java        
2011-08-06 22:49:15.000000000 +0200
-+++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java     
2011-08-07 01:05:02.000000000 +0200
-@@ -63,6 +63,7 @@
+--- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
++++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
+@@ -63,6 +63,7 @@ import org.openstreetmap.josm.gui.QuadSt
  import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
  import org.openstreetmap.josm.gui.layer.Layer;
  import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -51,7 +47,7 @@ Index: 
josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import 
org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1129,8 +1130,16 @@
+@@ -1058,8 +1059,16 @@ public class TaggingPreset extends Abstr
          ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, 
iconName, zipIcons);
          if (icon == null)
          {
diff --git a/debian/patches/80-fix_images.patch 
b/debian/patches/80-fix_images.patch
index 1f8c1f3..65f20c8 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -7,11 +7,9 @@ Forwarded: not-needed
  data/defaultpresets.xml |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: josm/data/defaultpresets.xml
-===================================================================
---- josm.orig/data/defaultpresets.xml  2011-08-06 22:49:13.000000000 +0200
-+++ josm/data/defaultpresets.xml       2011-08-07 01:11:49.000000000 +0200
-@@ -2272,7 +2272,7 @@
+--- josm.orig/data/defaultpresets.xml
++++ josm/data/defaultpresets.xml
+@@ -2419,7 +2419,7 @@ are supplied, then "values" will be trea
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" default="" delete_if_empty="true" />
          </item>
@@ -20,10 +18,10 @@ Index: josm/data/defaultpresets.xml
              <link 
href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library";
                    
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library"; />
              <label text="Edit Library" />
-@@ -2471,7 +2471,7 @@
-             <label text="(Use international code, like +12-345-67890)" />
+@@ -2629,7 +2629,7 @@ are supplied, then "values" will be trea
              <space />
          </item>
+         <separator/>
 -        <item name="Veterinary" icon="styles/standard/health/veterinary.png" 
type="node,closedway">
 +        <item name="Veterinary" icon="presets/empty.png" 
type="node,closedway">
              <link 
href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary";

-- 
Editor for OpenStreetMap

_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits

Reply via email to