[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5576+dfsg1-1-8-gc026171

[David Paleino]

The following commit has been merged in the master branch:
commit 7e9f07cb3b6df884ab7ec55909265ed11bfe9dd4
Author: David Paleino <dapal at debian.org>
Date:   Wed Dec 19 22:30:02 2012 +0100

    Patches refreshed

diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index a94eb72..8005110 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -47,9 +47,9 @@ applications. This patch points josm to the shared directories.
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference.PresetPrefHelper;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1273,7 +1274,20 @@ public class TaggingPreset extends Abstr
+@@ -1289,7 +1290,20 @@ public class TaggingPreset extends Abstr
          if (maxSize != null) {
-             imgProv.setMaxSize(24);
+             imgProv.setMaxSize(maxSize);
          }
 -        return imgProv.get();
 +        ImageIcon icon = imgProv.get();
diff --git a/debian/patches/04-fix_images.patch b/debian/patches/04-fix_images.patch
index 1bdb5bf..b111d83 100644
--- a/debian/patches/04-fix_images.patch
+++ b/debian/patches/04-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -3109,7 +3109,7 @@ Note that for a match, at least one posi
+@@ -3243,7 +3243,7 @@ Note that for a match, at least one posi
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" />
          </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"
-@@ -3428,7 +3428,7 @@ Note that for a match, at least one posi
+@@ -3562,7 +3562,7 @@ Note that for a match, at least one posi
              <space />
          </item>
          <separator/>

-- 
Editor for OpenStreetMap