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

[Bas Couwenberg]

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

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

commit 4ca811fb78154d8fe48c295b245a7d8b782007ce
Merge: ee868d5 a2e5296
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 7 09:45:22 2016 +0200

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

 .classpath                                         |  2 +-
 .settings/org.eclipse.jdt.core.prefs               |  6 +--
 build.xml                                          |  4 --
 debian/ant.properties                              |  4 +-
 debian/changelog                                   | 12 +++++
 debian/control                                     |  4 +-
 debian/mkgmap.sh                                   |  1 -
 debian/patches/build_xml.patch                     | 15 +++---
 resources/mkgmap-version.properties                |  4 +-
 scripts/download/mkdoc                             |  1 +
 src/uk/me/parabola/imgfmt/app/net/RouteNode.java   | 37 +++++++++----
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    | 58 +++++++++++++++++++-
 .../mkgmap/filters/DouglasPeuckerFilter.java       | 25 ++++-----
 .../PreserveHorizontalAndVerticalLinesFilter.java  | 62 ----------------------
 src/uk/me/parabola/mkgmap/general/MapLine.java     |  8 ++-
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |  2 +-
 test/func/SimpleTest.java                          |  2 +-
 test/func/route/SimpleRouteTest.java               |  6 +--
 .../uk/me/parabola/imgfmt/app/typ/TYPFileTest.java | 12 +++--
 .../mkgmap/osmstyle/RuleFileReaderTest.java        | 16 ++++++
 .../me/parabola/mkgmap/typ/TypTextReaderTest.java  | 14 ++---
 21 files changed, 165 insertions(+), 130 deletions(-)

diff --cc debian/changelog
index 56503e9,f69f01e..77eba9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
+ mkgmap (0.0.0+svn3694-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+     - move to java 1.8.
+   * Use headless variant of JDK & JRE dependencies.
+   * Update JDK & JRE dependencies to require at least version 1.8.
+   * Update ant.properties to use 1.8 source & target.
+   * Drop OpenJDK 7 from launcher script.
+   * Refresh patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Sep 2016 10:17:54 +0200
+ 
 +mkgmap (0.0.0+svn3686-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 08 Aug 2016 10:15:20 +0200
 +
  mkgmap (0.0.0+svn3686-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