The following commit has been merged in the master branch:
commit 334f7393577a85b124cc88fa61909332990ea54b
Author: David Paleino <da...@debian.org>
Date:   Sun Mar 18 18:42:33 2012 +0100

    Refresh patches

diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index e791dd8..8f03454 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;
-@@ -63,6 +66,8 @@ public class AboutAction extends JosmAct
+@@ -65,6 +68,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,7 +33,7 @@ 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));
-@@ -70,7 +75,7 @@ public class AboutAction extends JosmAct
+@@ -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));
          info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0));
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index 613b87b..d43ae84 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -14,7 +14,7 @@ applications. This patch points josm to the shared 
directories.
 
 --- josm.orig/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ josm/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -155,14 +155,19 @@ public class MapPaintStyles {
+@@ -143,14 +143,19 @@ public class MapPaintStyles {
          }
  
          if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
@@ -45,7 +45,7 @@ applications. This patch points josm to the shared 
directories.
  import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
- import 
org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
+ 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();
diff --git a/debian/patches/70-default_look_and_feel.patch 
b/debian/patches/70-default_look_and_feel.patch
index 6af54bd..eb4f8b1 100644
--- a/debian/patches/70-default_look_and_feel.patch
+++ b/debian/patches/70-default_look_and_feel.patch
@@ -11,9 +11,9 @@ Patch rewritten for new code, original patch was from Ubuntu's
 
 --- josm.orig/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
 +++ josm/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -80,7 +80,7 @@ public class PlatformHookUnixoid impleme
-     }
+@@ -70,7 +70,7 @@ public class PlatformHookUnixoid impleme
  
+     @Override
      public String getDefaultStyle() {
 -        return "javax.swing.plaf.metal.MetalLookAndFeel";
 +        return "javax.swing.plaf.gtk.GTKLookAndFeel";
diff --git a/debian/patches/80-fix_images.patch 
b/debian/patches/80-fix_images.patch
index 0d3c025..a15e0c4 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
-@@ -2955,7 +2955,7 @@ are supplied, then "values" will be trea
+@@ -2956,7 +2956,7 @@ are supplied, then "values" will be trea
              <key key="amenity" value="theatre" />
              <text key="name" text="Name" default="" delete_if_empty="true" />
          </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";
-@@ -3259,7 +3259,7 @@ are supplied, then "values" will be trea
+@@ -3260,7 +3260,7 @@ are supplied, then "values" will be trea
              <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