[mkgmap-splitter] 01/03: Merge tag 'debian/0.0.0+svn438-2' 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-splitter.

commit 066a15cef3a84d8911baa3bbb1648401ea723451
Merge: 4fd963d 43ae9e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 13 13:43:28 2016 +0200

    Merge tag 'debian/0.0.0+svn438-2' into jessie-backports
    
    Conflicts:
    	debian/changelog

 build.xml                                          | 630 ++++++++++-----------
 debian/changelog                                   |  20 +
 debian/control                                     |   6 +-
 debian/copyright                                   |  14 +-
 debian/mkgmap-splitter.sh                          |   1 -
 debian/patches/local-dependencies.patch            | 138 ++---
 resources/splitter-version.properties              |   4 +-
 .../core/filter/common/PolygonFileReader.java      |   4 +-
 .../parabola/splitter/BackgroundInputStream.java   |   4 +-
 src/uk/me/parabola/splitter/BinaryMapParser.java   |   9 +-
 src/uk/me/parabola/splitter/BinaryMapWriter.java   |  16 +-
 src/uk/me/parabola/splitter/JVMHealthMonitor.java  |   2 +-
 src/uk/me/parabola/splitter/Main.java              |   2 +-
 .../me/parabola/splitter/MultiTileProcessor.java   |  10 +-
 src/uk/me/parabola/splitter/PrecompSeaReader.java  |   2 +-
 .../me/parabola/splitter/ProblemListProcessor.java |  12 +-
 .../me/parabola/splitter/SparseLong2ShortMap.java  |   6 +-
 .../parabola/splitter/SparseLong2ShortMapHuge.java |  23 +-
 .../splitter/SparseLong2ShortMapInline.java        |  21 +-
 src/uk/me/parabola/splitter/SplitProcessor.java    |  36 +-
 src/uk/me/parabola/splitter/TileMetaInfo.java      |   3 -
 src/uk/me/parabola/splitter/WriterGrid.java        |   4 +-
 .../parabola/splitter/TestCustomCollections.java   |  36 +-
 23 files changed, 511 insertions(+), 492 deletions(-)

diff --cc debian/changelog
index bf31ed8,88cec59..63e01cb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ mkgmap-splitter (0.0.0+svn438-2) unstable; urgency=medium
+ 
+   * Drop OpenJDK 7 from launcher script.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Aug 2016 23:40:41 +0200
+ 
+ mkgmap-splitter (0.0.0+svn438-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+     - move to java 1.8.
+   * Update copyright file, changes:
+     - Reorder copyright holders
+     - Add license & copyright for build.xml
+   * Update JDK & JRE dependencies to require at least version 1.8.
+   * Bump Standards-Version to 3.9.8, no changes.
+   * Refresh patches.
+   * Use headless variant of JDK & JRE dependencies.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 06 Aug 2016 13:09:01 +0200
+ 
 +mkgmap-splitter (0.0.0+svn437-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Apr 2016 19:00:15 +0200
 +
  mkgmap-splitter (0.0.0+svn437-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 6a528d5,8a5f3e3..e67bc38
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 3.9.7
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap-splitter.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap-splitter.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap-splitter.git -b jessie-backports
  Homepage: http://www.mkgmap.org.uk/doc/splitter.html
  
  Package: mkgmap-splitter

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