The following commit has been merged in the master branch:
commit 50c7dc2982944589adab7935caafbc8e7bdf6b6b
Author: David Paleino <da...@debian.org>
Date:   Wed May 30 09:57:36 2012 +0200

    Patches refreshed

diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index d08f78e..d64788a 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -24,7 +24,7 @@ bug triaging.
  import javax.swing.BorderFactory;
  import javax.swing.JLabel;
  import javax.swing.JOptionPane;
-@@ -65,6 +68,8 @@ public class AboutAction extends JosmAct
+@@ -73,6 +76,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());
@@ -33,15 +33,15 @@ 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));
-@@ -73,7 +78,7 @@ public class AboutAction extends JosmAct
+@@ -81,7 +86,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",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);
+         about.addTab(tr("Info"), info);
+         about.addTab(tr("Readme"), createScrollPane(readme));
 --- josm.orig/src/org/openstreetmap/josm/data/Version.java
 +++ josm/src/org/openstreetmap/josm/data/Version.java
 @@ -66,6 +66,7 @@ public class Version {
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index 77a60b1..eeb071c 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
-@@ -66,6 +66,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -67,6 +67,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,7 +47,7 @@ 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;
-@@ -1259,8 +1260,16 @@ public class TaggingPreset extends Abstr
+@@ -1243,8 +1244,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) {
diff --git a/debian/patches/80-fix_images.patch 
b/debian/patches/80-fix_images.patch
index 5693bb2..51edc10 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
-@@ -2966,7 +2966,7 @@ Note that for a match, at least one posi
+@@ -2974,7 +2974,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";
-@@ -3270,7 +3270,7 @@ Note that for a match, at least one posi
+@@ -3278,7 +3278,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