The following commit has been merged in the master branch:
commit a915c1d3fa2846b87be13c0677fa7152152fee97
Author: David Paleino <da...@debian.org>
Date:   Thu Apr 19 12:09:34 2012 +0200

    Patches refreshed

diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 8f03454..d08f78e 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -33,12 +33,12 @@ bug triaging.
          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));
-@@ -72,7 +77,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));
+@@ -73,7 +78,7 @@ public class AboutAction extends JosmAct
+         info.add(new UrlLabel("http://josm.openstreetmap.de",2), 
GBC.eol().fill(GBC.HORIZONTAL));
+         info.add(GBC.glue(0,5), GBC.eol());
          info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
--        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket";), 
GBC.eol().fill(GBC.HORIZONTAL));
-+        info.add(new UrlLabel("http://bugs.debian.org";), 
GBC.eol().fill(GBC.HORIZONTAL));
+-        info.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), 
GBC.eol().fill(GBC.HORIZONTAL));
++        info.add(new UrlLabel("http://bugs.debian.org";, 2), 
GBC.eol().fill(GBC.HORIZONTAL));
  
          JTextArea revision = new JTextArea();
          revision.setEditable(false);
@@ -91,12 +91,12 @@ bug triaging.
                              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 
UrlLabel("http://josm.openstreetmap.de/#Download",2), 
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));
+-                            p.add(new UrlLabel(url.toString(), 
"http://josm.openstreetmap.de/josmticket?...",2), 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 " +
@@ -106,7 +106,7 @@ bug triaging.
                              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));
+-                            p.add(new 
UrlLabel("http://josm.openstreetmap.de/newticket",2), 
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 45b31ae..77a60b1 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -39,7 +39,7 @@ applications. This patch points josm to the shared 
directories.
  
 --- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -65,6 +65,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -66,6 +66,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;
@@ -47,22 +47,22 @@ 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;
-@@ -1060,8 +1061,16 @@ public class TaggingPreset extends Abstr
-         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);
--            icon = new ImageIcon(iconName);
-+            if (iconName.startsWith("styles/standard/")) {
-+                String realIconName = iconName.replaceAll("styles/standard/", 
"");
-+                LinkedList<String> dirs = new LinkedList<String>();
-+                MapPaintStyles.addDebianDirs(dirs);
-+                icon = new 
ImageProvider(realIconName).setDirs(dirs).setId("presets").setArchive(zipIcons).setOptional(true).get();
-+            }
-+            if (icon == null) {
-+                System.out.println("Could not get presets icon " + iconName);
-+                icon = new ImageIcon(iconName);
-+            }
-         }
-         if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 16) {
-             icon = new ImageIcon(icon.getImage().getScaledInstance(16, 16, 
Image.SCALE_SMOOTH));
+@@ -1259,8 +1260,16 @@ public class TaggingPreset extends Abstr
+                 final Collection<String> s = 
Main.pref.getCollection("taggingpreset.icon.sources", null);
+                 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);
+-                    icon = new ImageIcon(iconName);
++                    if (iconName.startsWith("styles/standard/")) {
++                        String realIconName = 
iconName.replaceAll("styles/standard/", "");
++                        LinkedList<String> dirs = new LinkedList<String>();
++                        MapPaintStyles.addDebianDirs(dirs);
++                        icon = new 
ImageProvider(realIconName).setDirs(dirs).setId("presets").setArchive(zipIcons).setOptional(true).get();
++                    }
++                    if (icon == null) {
++                        System.out.println("Could not get presets icon " + 
iconName);
++                        icon = new ImageIcon(iconName);
++                    }
+                 }
+                 if (Math.max(icon.getIconHeight(), icon.getIconWidth()) != 
16) {
+                     icon = new 
ImageIcon(icon.getImage().getScaledInstance(16, 16, Image.SCALE_SMOOTH));
diff --git a/debian/patches/80-fix_images.patch 
b/debian/patches/80-fix_images.patch
index a15e0c4..5693bb2 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,16 +9,16 @@ Forwarded: not-needed
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -2956,7 +2956,7 @@ are supplied, then "values" will be trea
+@@ -2966,7 +2966,7 @@ Note that for a match, at least one posi
              <key key="amenity" value="theatre" />
-             <text key="name" text="Name" default="" delete_if_empty="true" />
+             <text key="name" text="Name" />
          </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";
                    
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library";
                    
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library";
-@@ -3260,7 +3260,7 @@ are supplied, then "values" will be trea
+@@ -3270,7 +3270,7 @@ Note that for a match, at least one posi
              <space />
          </item>
          <separator/>

-- 
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