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

commit cda9651b88ccb53790228c5b4fd2deda1a87fdf4
Merge: 9f664bb adfb2c0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 7 09:42:02 2016 +0200

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

 debian/changelog                                    |  7 +++++++
 debian/control                                      |  6 +++---
 resources/splitter-version.properties               |  4 ++--
 src/uk/me/parabola/splitter/Area.java               |  7 +++++--
 src/uk/me/parabola/splitter/Main.java               | 18 +++++++++++++-----
 src/uk/me/parabola/splitter/MultiTileProcessor.java |  2 +-
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 8b5ad5b,7e5e713..216ec13
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ mkgmap-splitter (0.0.0+svn439-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Include epoch in default-jdk-headless version requirement.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Sep 2016 09:55:51 +0200
+ 
 +mkgmap-splitter (0.0.0+svn438-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Use OpenJDK 8 for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 13 Aug 2016 13:43:32 +0200
 +
  mkgmap-splitter (0.0.0+svn438-2) unstable; urgency=medium
  
    * Drop OpenJDK 7 from launcher script.

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