[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3686-1' into jessie-backports

Bas Couwenberg sebastic at debian.org
Mon Aug 8 08:40:52 UTC 2016


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

sebastic pushed a commit to branch jessie-backports
in repository mkgmap.

commit babf826174ee19d7763054a7e5b574497f9cf8f0
Merge: 1e7cd3f 69a0d17
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 8 10:15:14 2016 +0200

    Merge tag 'debian/0.0.0+svn3686-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |   7 +
 debian/patches/build_xml.patch                     |   3 +-
 debian/patches/java8-compatibility.patch           |  76 --------
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/landuse_polygons      |   1 +
 src/uk/me/parabola/imgfmt/app/BitWriter.java       |  23 +++
 .../parabola/imgfmt/app/trergn/LinePreparer.java   | 204 ++++++++++++---------
 src/uk/me/parabola/imgfmt/app/trergn/Polyline.java |   4 +-
 .../parabola/mkgmap/combiners/OverviewBuilder.java |  72 +++++++-
 .../mkgmap/filters/PolygonSplitterBase.java        |   2 +-
 .../filters/PolygonSubdivSizeSplitterFilter.java   |   4 +
 .../mkgmap/filters/RemoveObsoletePointsFilter.java |  24 ++-
 .../mkgmap/reader/osm/MultiPolygonRelation.java    |  12 +-
 test/uk/me/parabola/imgfmt/app/BitReaderTest.java  |  21 +++
 14 files changed, 268 insertions(+), 189 deletions(-)

diff --cc debian/changelog
index 2a8890c,4024017..7bf300c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3686-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Drop unused java8-compatibility.patch.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Aug 2016 10:35:21 +0200
+ 
 +mkgmap (0.0.0+svn3677-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jul 2016 21:46:38 +0200
 +
  mkgmap (0.0.0+svn3677-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.

-- 
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