[mkgmap-splitter] 01/02: Merge tag 'debian/0.0.0+svn548-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 bbf707e8cd63551147b9e11c9778f9d4603936f5
Merge: 7dc53a7 ffdd5aa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 11 18:35:49 2017 +0100

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

 debian/changelog                                   |   7 +
 debian/copyright                                   |  32 +-
 resources/splitter-version.properties              |   4 +-
 .../me/parabola/splitter/AbstractMapProcessor.java |  47 +-
 src/uk/me/parabola/splitter/AreaDictionary.java    | 186 +++++
 src/uk/me/parabola/splitter/AreaDictionaryInt.java |  96 ---
 .../me/parabola/splitter/AreaDictionaryShort.java  | 212 ------
 src/uk/me/parabola/splitter/AreaGrid.java          |  60 +-
 src/uk/me/parabola/splitter/AreaGridResult.java    |   4 +-
 src/uk/me/parabola/splitter/AreaList.java          |  52 ++
 src/uk/me/parabola/splitter/AreaSet.java           | 199 +++++
 src/uk/me/parabola/splitter/AreasCalculator.java   | 422 -----------
 src/uk/me/parabola/splitter/BinaryMapWriter.java   | 536 --------------
 src/uk/me/parabola/splitter/DataStorer.java        | 360 +++++-----
 src/uk/me/parabola/splitter/Element.java           |   4 +-
 src/uk/me/parabola/splitter/Main.java              | 797 ++++++++------------
 src/uk/me/parabola/splitter/MapProcessor.java      |  15 +
 src/uk/me/parabola/splitter/MapReader.java         |  26 -
 .../me/parabola/splitter/MultiTileProcessor.java   | 161 ++---
 src/uk/me/parabola/splitter/OSMFileHandler.java    | 226 +++---
 src/uk/me/parabola/splitter/OSMMessage.java        |  46 ++
 .../me/parabola/splitter/ProblemListProcessor.java | 128 ++--
 src/uk/me/parabola/splitter/ProblemLists.java      | 784 ++++++++++++++------
 src/uk/me/parabola/splitter/QueueProcessor.java    | 133 ++++
 src/uk/me/parabola/splitter/Relation.java          |   4 +-
 src/uk/me/parabola/splitter/RoundingUtils.java     |   2 +-
 src/uk/me/parabola/splitter/SparseBitSet.java      | 107 ---
 .../me/parabola/splitter/SparseLong2ShortMap.java  |  28 -
 .../splitter/SparseLong2ShortMapFunction.java      |  31 -
 .../parabola/splitter/SparseLong2ShortMapHuge.java | 560 ---------------
 .../splitter/SparseLong2ShortMapInline.java        | 562 ---------------
 .../me/parabola/splitter/SplitFailedException.java |  11 +-
 src/uk/me/parabola/splitter/SplitProcessor.java    | 247 +++----
 src/uk/me/parabola/splitter/Utils.java             |   4 +-
 .../me/parabola/splitter/args/SplitterParams.java  |   8 +-
 .../me/parabola/splitter/{ => kml}/KmlParser.java  |   8 +-
 .../me/parabola/splitter/{ => kml}/KmlWriter.java  |   7 +-
 .../splitter/{ => parser}/BinaryMapParser.java     | 133 ++--
 .../splitter/{ => parser}/ElementCounter.java      |  13 +-
 .../splitter/{ => parser}/O5mMapParser.java        | 511 +++++++------
 .../{OSMParser.java => parser/OSMXMLParser.java}   |  15 +-
 .../parabola/splitter/solver/AreasCalculator.java  | 237 ++++++
 .../parabola/splitter/{ => solver}/DensityMap.java |   8 +-
 .../splitter/{ => solver}/DensityMapCollector.java |  33 +-
 .../splitter/{ => solver}/EnhancedDensityMap.java  |   5 +-
 .../splitter/{ => solver}/PolygonDesc.java         |  22 +-
 .../{ => solver}/PolygonDescProcessor.java         |  57 +-
 .../splitter/{ => solver}/PrecompSeaReader.java    | 261 +++----
 .../parabola/splitter/{ => solver}/Solution.java   |   8 +-
 .../{ => solver}/SplittableDensityArea.java        | 141 ++--
 src/uk/me/parabola/splitter/{ => solver}/Tile.java |  53 +-
 .../splitter/{ => solver}/TileMetaInfo.java        |   2 +-
 .../splitter/{ => tools}/Long2IntClosedMap.java    |   6 +-
 .../{ => tools}/Long2IntClosedMapFunction.java     |   4 +-
 .../splitter/{ => tools}/OSMId2ObjectMap.java      |   6 +-
 .../me/parabola/splitter/tools/SparseBitSet.java   | 105 +++
 .../parabola/splitter/tools/SparseLong2IntMap.java | 798 +++++++++++++++++++++
 .../splitter/{ => writer}/AbstractOSMWriter.java   |  26 +-
 .../parabola/splitter/writer/BinaryMapWriter.java  | 519 ++++++++++++++
 .../splitter/{ => writer}/O5mMapWriter.java        |  11 +-
 .../parabola/splitter/{ => writer}/OSMWriter.java  |  10 +-
 .../splitter/{ => writer}/OSMXMLWriter.java        |  84 ++-
 .../splitter/{ => writer}/PseudoOSMWriter.java     |   7 +-
 .../{ => xml/parser}/AbstractXppParser.java        |   6 +-
 test/uk/me/parabola/splitter/TestAreaSet.java      |  85 +++
 .../parabola/splitter/TestCustomCollections.java   | 203 ------
 test/uk/me/parabola/splitter/TestSparseBitSet.java |  56 --
 .../splitter/tools/TestCustomCollections.java      | 322 +++++++++
 .../parabola/splitter/tools/TestSparseBitSet.java  |  60 ++
 69 files changed, 5058 insertions(+), 4865 deletions(-)

diff --cc debian/changelog
index 285e395,b016301..c93b11c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap-splitter (0.0.0+svn548-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Update copyright file for renamed files.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 01 Jan 2017 00:40:21 +0100
+ 
 +mkgmap-splitter (0.0.0+svn468-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 07 Dec 2016 18:40:17 +0100
 +
  mkgmap-splitter (0.0.0+svn468-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