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

[Sebastiaan 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 9309b18e906f4597d24409cd5b6af5cdaf8e8366
Merge: 440f854 e7b37d2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 8 19:00:11 2016 +0200

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

 debian/changelog                                   |   6 ++
 resources/splitter-version.properties              |   4 +-
 src/uk/me/parabola/splitter/AbstractOSMWriter.java |  21 +++-
 src/uk/me/parabola/splitter/BinaryMapParser.java   |   7 ++
 src/uk/me/parabola/splitter/BinaryMapWriter.java   |  15 ++-
 .../me/parabola/splitter/DensityMapCollector.java  |  14 ++-
 src/uk/me/parabola/splitter/Element.java           |  10 +-
 .../me/parabola/splitter/EnhancedDensityMap.java   |  41 ++++++--
 src/uk/me/parabola/splitter/Main.java              |  25 ++++-
 src/uk/me/parabola/splitter/O5mMapParser.java      |  12 ++-
 src/uk/me/parabola/splitter/O5mMapWriter.java      |  21 +++-
 src/uk/me/parabola/splitter/OSMParser.java         |  12 ++-
 src/uk/me/parabola/splitter/OSMXMLWriter.java      |  11 +-
 .../parabola/splitter/SplittableDensityArea.java   |  24 +++--
 src/uk/me/parabola/splitter/Tile.java              | 114 +++++++++++++++++++--
 .../me/parabola/splitter/args/SplitterParams.java  |   6 ++
 16 files changed, 300 insertions(+), 43 deletions(-)

diff --cc debian/changelog
index 61ae03a,21f5e45..bd4ebb6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mkgmap-splitter (0.0.0+svn437-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 01:10:39 +0200
+ 
 +mkgmap-splitter (0.0.0+svn429-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 10 Mar 2016 18:30:49 +0100
 +
  mkgmap-splitter (0.0.0+svn429-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-splitter.git