[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5267+dfsg1-2-11-gcc30cb5

[David Paleino]

The following commit has been merged in the master branch:
commit 5aa8b92c77313a05af6e41539935f33a4c97f367
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 10 10:57:01 2012 +0200

    06-handle_redacted_objects.patch dropped too

diff --git a/debian/changelog b/debian/changelog
index eb30d15..e01afb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,12 @@ josm (0.0.svn5531+dfsg1-1) UNRELEASED; urgency=low
   * Don't prefer IPv4 stack anymore in josm wrapper script, since
     it seems to be functional now (Closes: #654515)
   * Patches refreshed to match new upstream code
-  * 07-handle_deleted_nodes_without_coordinates.patch dropped, was
+  * 06-handle_redacted_objects.patch and
+    07-handle_deleted_nodes_without_coordinates.patch dropped, were
     backported from upstream
   * Standards-Version bump to 3.9.4, no changes needed
 
- -- David Paleino <dapal at debian.org>  Wed, 10 Oct 2012 10:54:14 +0200
+ -- David Paleino <dapal at debian.org>  Wed, 10 Oct 2012 11:05:32 +0200
 
 josm (0.0.svn5267+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/patches/06-handle_redacted_objects.patch b/debian/patches/06-handle_redacted_objects.patch
deleted file mode 100644
index 7cfc669..0000000
--- a/debian/patches/06-handle_redacted_objects.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Don-vip
-Subject: handle redacted objects resulting from OSM License change process
-Origin: upstream, http://josm.openstreetmap.de/changeset/5339/josm
- upstream, http://josm.openstreetmap.de/changeset/5340/josm
-Bug-Debian: http://bugs.debian.org/682315
-
----
- src/org/openstreetmap/josm/data/osm/history/History.java        |   14 ++++++++++
- src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java |    5 +++
- 2 files changed, 19 insertions(+)
-
---- josm.orig/src/org/openstreetmap/josm/data/osm/history/History.java
-+++ josm/src/org/openstreetmap/josm/data/osm/history/History.java
-@@ -244,4 +244,18 @@ public class History{
-         result += "]";
-         return result;
-     }
-+
-+    @Override
-+    public String toString() {
-+        String result = "History ["
-+                + (type != null ? "type=" + type + ", " : "") + "id=" + id;
-+        if (versions != null) {
-+            result += ", versions=\n";
-+            for (HistoryOsmPrimitive v : versions) {
-+                result += "\t" + v + ",\n";
-+            }
-+        }
-+        result += "]";
-+        return result;
-+    }
- }
---- josm.orig/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
-+++ josm/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
-@@ -169,6 +169,11 @@ public class HistoryBrowserModel extends
-         if (history.getLatest().getVersion() > primitive.getVersion())
-             return false;
- 
-+        // if latest version from history is higher than a non existing primitive version,
-+        // that means this version has been redacted and the primitive cannot be used.
-+        if (history.getLatest().getVersion() > primitive.getVersion())
-+            return false;
-+
-         // latest has a higher version than one of the primitives
-         // in the history (probably because the history got out of sync
-         // with uploaded data) -> show the primitive as latest
diff --git a/debian/patches/series b/debian/patches/series
index b002fc0..d6554b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 04-fix_images.patch
 05-fix_version.patch
 #100-fix_SlippyMapBBoxChooser.patch
-06-handle_redacted_objects.patch

-- 
Editor for OpenStreetMap