[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4021-1-6-gfafa743

[David Paleino]

The following commit has been merged in the master branch:
commit fafa74334516242259ae2b75e2a49595c64ef97b
Author: David Paleino <dapal at debian.org>
Date:   Tue May 3 17:23:16 2011 +0200

    Patches refreshed to cleanly apply

diff --git a/debian/changelog b/debian/changelog
index 6aa1a26..bba42bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm (0.0.svn4064-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
+  * Patches refreshed to cleanly apply
 
- -- David Paleino <dapal at debian.org>  Tue, 03 May 2011 17:17:48 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 03 May 2011 17:23:05 +0200
 
 josm (0.0.svn4021-2) UNRELEASED; urgency=low
 
diff --git a/debian/patches/40-elemstyles.patch b/debian/patches/40-elemstyles.patch
index 48b7a67..3836953 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -34,7 +34,7 @@ Subject: the icons have been removed from the JAR file because they are already
  
 --- josm.orig/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
 +++ josm/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
-@@ -62,6 +62,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -63,6 +63,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;
@@ -42,7 +42,7 @@ Subject: the icons have been removed from the JAR file because they are already
  import org.openstreetmap.josm.gui.preferences.SourceEntry;
  import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference.PresetPrefMigration;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1097,8 +1098,16 @@ public class TaggingPreset extends Abstr
+@@ -1127,8 +1128,16 @@ public class TaggingPreset extends Abstr
          ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName, zipIcons);
          if (icon == null)
          {
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index a2d2f9a..f3f4689 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: no
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -2252,7 +2252,7 @@ are supplied, then "values" will be trea
+@@ -2264,7 +2264,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: no
              <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" />
-@@ -2451,7 +2451,7 @@ are supplied, then "values" will be trea
+@@ -2463,7 +2463,7 @@ are supplied, then "values" will be trea
              <label text="(Use international code, like +12-345-67890)" />
              <space />
          </item>

-- 
Editor for OpenStreetMap