[mkgmap] 04/05: Drop unused java8-compatibility.patch.

Bas Couwenberg sebastic at debian.org
Mon Aug 1 08:46:52 UTC 2016


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

sebastic pushed a commit to branch master
in repository mkgmap.

commit 0614a4bb077723e142255de237e75cf01580cca4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 1 10:31:31 2016 +0200

    Drop unused java8-compatibility.patch.
---
 debian/changelog                         |  1 +
 debian/patches/build_xml.patch           |  3 +-
 debian/patches/java8-compatibility.patch | 76 --------------------------------
 3 files changed, 2 insertions(+), 78 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf71606..7922dfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mkgmap (0.0.0+svn3686-1) UNRELEASED; urgency=medium
 
   * New upstream SVN snapshot.
+  * Drop unused java8-compatibility.patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Aug 2016 10:26:50 +0200
 
diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch
index 00eab36..7b8cc31 100644
--- a/debian/patches/build_xml.patch
+++ b/debian/patches/build_xml.patch
@@ -1,5 +1,3 @@
-Author: Andreas Tille <tille at debian.org>
-LastChanged: Fri, 24 Jan 2014 16:04:34 +0100
 Description: Leave out IVY dependency checker
  Attention: This patch is most probably not yet finished.
  I went until the point when I noticed that mkgmap needs a
@@ -10,6 +8,7 @@ Description: Leave out IVY dependency checker
  It seems the remaining precondition would be at
    https://github.com/osmandapp/OsmAnd-tools/blob/master/OsmAndMapCreator/src/crosby/binary/Osmformat.java
  I need to check this out
+Author: Andreas Tille <tille at debian.org>
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
deleted file mode 100644
index e4da220..0000000
--- a/debian/patches/java8-compatibility.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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>
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/745097
---- a/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java
-+++ b/src/uk/me/parabola/mkgmap/osmstyle/RoadMerger.java
-@@ -458,9 +458,9 @@
- 		Coord mergePoint = points2.get(0);
- 		Coord endPoint= points2.get(points2.size()-1);
- 		
--		startPoints.remove(mergePoint, road2);
--		endPoints.remove(endPoint, road2);
--		endPoints.remove(mergePoint, road1);
-+		startPoints.removeKeyValue(mergePoint, road2);
-+		endPoints.removeKeyValue(endPoint, road2);
-+		endPoints.removeKeyValue(mergePoint, road1);
- 
- 		points1.addAll(points2.subList(1, points2.size()));
- 		endPoints.add(endPoint, road1);
---- a/src/uk/me/parabola/util/MultiIdentityHashMap.java
-+++ b/src/uk/me/parabola/util/MultiIdentityHashMap.java
-@@ -54,7 +54,7 @@
- 	    return ( results ? value : null );
- 	}
- 
--	public V remove(K key, V value )
-+	public V removeKeyValue(K key, V value )
- 	{
- 	    
- 	    List<V> values = super.get(key);
---- a/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java
-+++ b/src/uk/me/parabola/mkgmap/filters/LineMergeFilter.java
-@@ -29,9 +29,9 @@
- 		// Merges the points in the second one
- 		List<Coord> points1 = line1.getPoints();
- 		List<Coord> points2 = line2.getPoints();
--		startPoints.remove(points1.get(0), line1);
--		endPoints.remove(points1.get(points1.size()-1), line1);
--		startPoints.remove(points2.get(0), line2);
-+		startPoints.removeKeyValue(points1.get(0), line1);
-+		endPoints.removeKeyValue(points1.get(points1.size()-1), line1);
-+		startPoints.removeKeyValue(points2.get(0), line2);
- 		startPoints.add(points1.get(0), line2);
- 		line2.insertPointsAtStart(points1);
- 		linesMerged.remove(line1);
-@@ -40,7 +40,7 @@
- 	private void addPointsAtStart(MapLine line, List<Coord> additionalPoints) {
- 		log.info("merged lines before " + line.getName());
- 		List<Coord> points = line.getPoints();
--		startPoints.remove(points.get(0), line);
-+		startPoints.removeKeyValue(points.get(0), line);
- 		line.insertPointsAtStart(additionalPoints);
- 		startPoints.add(points.get(0), line);
- 	}
-@@ -48,7 +48,7 @@
- 	private void addPointsAtEnd(MapLine line, List<Coord> additionalPoints) {
- 		log.info("merged lines after " + line.getName());
- 		List<Coord> points = line.getPoints();
--		endPoints.remove(points.get(points.size()-1), line);
-+		endPoints.removeKeyValue(points.get(points.size()-1), line);
- 		line.insertPointsAtEnd(additionalPoints);
- 		endPoints.add(points.get(points.size()-1), line);
- 	}
---- a/src/uk/me/parabola/util/MultiHashMap.java
-+++ b/src/uk/me/parabola/util/MultiHashMap.java
-@@ -54,7 +54,7 @@
- 	    return ( results ? value : null );
- 	}
- 
--	public V remove(K key, V value )
-+	public V removeKeyValue(K key, V value )
- 	{
- 	    
- 	    List<V> values = super.get(key);

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



More information about the Pkg-grass-devel mailing list