The following commit has been merged in the master branch:
commit 98eb6a05e117f2301d1faeea5f7c6312bec03fab
Author: David Paleino <da...@debian.org>
Date:   Sat Oct 8 22:52:00 2011 +0200

    Patches refreshed to cleanly apply to new sources

diff --git a/debian/changelog b/debian/changelog
index cda872f..ba18faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm (0.0.svn4487+dfsg2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Patches refreshed to cleanly apply to new sources
 
- -- David Paleino <da...@debian.org>  Sat, 08 Oct 2011 22:48:28 +0200
+ -- David Paleino <da...@debian.org>  Sat, 08 Oct 2011 22:51:43 +0200
 
 josm (0.0.svn4399+dfsg2-2) unstable; urgency=low
 
diff --git a/debian/patches/40-elemstyles.patch 
b/debian/patches/40-elemstyles.patch
index 71a1a5d..66cc9f2 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
-@@ -63,6 +63,7 @@ import org.openstreetmap.josm.gui.QuadSt
+@@ -65,6 +65,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.TaggingPresetPreference.PresetPrefMigration;
  import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-@@ -1058,8 +1059,16 @@ public class TaggingPreset extends Abstr
+@@ -1060,8 +1061,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 65f20c8..b4350f7 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
-@@ -2419,7 +2419,7 @@ are supplied, then "values" will be trea
+@@ -2420,7 +2420,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";
                    
fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library"; />
              <label text="Edit Library" />
-@@ -2629,7 +2629,7 @@ are supplied, then "values" will be trea
+@@ -2630,7 +2630,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