[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4550+dfsg2-1-7-g88d4d0d

Mon Dec 19 21:21:55 UTC 2011

The following commit has been merged in the master branch:
commit 9edf22a6219c0f0fec0382497bfef40913a86422
Author: David Paleino <dapal at debian.org>
Date:   Mon Dec 19 21:30:19 2011 +0100

    Patches refreshed

diff --git a/debian/changelog b/debian/changelog
index 0e53f98..7144d30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn4666+dfsg1-1) UNRELEASED; urgency=low
 
   * New upstream snapshot (Closes: #652645)
   * Fix dependency on OpenJDK 7 (Closes: #651731)
+  * Patches refreshed
 
- -- David Paleino <dapal at debian.org>  Sun, 11 Dec 2011 20:09:01 +0100
+ -- David Paleino <dapal at debian.org>  Mon, 19 Dec 2011 21:30:09 +0100
 
 josm (0.0.svn4550+dfsg2-1) unstable; urgency=low
 
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 945c091..0e9a3e0 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -74,8 +74,8 @@ bug triaging.
       *
 --- 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,
+@@ -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>" +
@@ -83,9 +83,9 @@ bug triaging.
 +                                "Please consider being kind and file a bug report.\n" +
 +                                "See http://bugs.debian.org for a guide how to do this."
                          )
-                         + "</html>",
-                         tr("Unexpected Exception"),
-@@ -106,21 +106,13 @@ public final class BugReportExceptionHan
+                         + "</html>"), GBC.eol());
+                 JCheckBox cbSuppress = null;
+@@ -122,21 +122,13 @@ public final class BugReportExceptionHan
  
                      JPanel p = new JPanel(new GridBagLayout());
                      p.add(new JMultilineLabel(
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index ac70e57..acda523 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,21 +9,21 @@ Forwarded: not-needed
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -2428,7 +2428,7 @@ are supplied, then "values" will be trea
+@@ -2918,7 +2918,7 @@ are supplied, then "values" will be trea
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" default="" delete_if_empty="true" />
          </item>
 -        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
 +        <item name="Library" icon="presets/empty.png" type="node,closedway,relation">
              <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" />
-@@ -2638,7 +2638,7 @@ are supplied, then "values" will be trea
+                   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
              <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"
-                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-             <label text="Edit Veterinary" />
+                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=veterinary"
+                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary"

-- 
Editor for OpenStreetMap

