[mkgmap] 01/01: Verified that upstream has cared for Java 8 compatibility

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mkgmap.

commit 002192efc9188e279668cff249dcfcd02d6779dc
Author: Andreas Tille <tille at debian.org>
Date:   Tue Aug 19 17:40:28 2014 +0200

    Verified that upstream has cared for Java 8 compatibility
---
 debian/changelog                         | 4 ++--
 debian/patches/java8-compatibility.patch | 2 +-
 debian/patches/series                    | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aac852f..fc8cda5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mkgmap (0.0.0+svn3333-1) UNRELEASED; urgency=medium
+mkgmap (0.0.0+svn3333-1) unstable; urgency=medium
 
   * New upstream version
+    Closes: #745097
   * add debian/classpath (thanks for the patch to Manfred Stock
     <manfred.stock+debian at gmail.com>)
     Closes: #741596
   * d/copyright: DEP5
-  * TODO: Make java8-compatibility.patch apply to this upstream version
 
  -- Andreas Tille <tille at debian.org>  Wed, 13 Aug 2014 22:13:41 +0200
 
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
index eeb0236..e4da220 100644
--- a/debian/patches/java8-compatibility.patch
+++ b/debian/patches/java8-compatibility.patch
@@ -1,4 +1,4 @@
-Note: Does not apply to latest upstream
+Status: Upstream seems to have solved this (with some slightly different names - so patch is deactivated
 Description: Rename the MultiHashMap and MultiIdentityHashMap remove(K, V) methods
  to avoid a conflict with the new Map.remove(Object, Object) method introduced in Java 8
 Author: Emmanuel Bourg <ebourg at apache.org>
diff --git a/debian/patches/series b/debian/patches/series
index 0e645a8..46a7f4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 build_xml.patch
-java8-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git