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 174ea361837b28c224e31c1bd87b2ef9d1e469d3 Merge: 641a72a ad23851 Author: Bas Couwenberg <[email protected]> Date: Wed Dec 7 18:40:12 2016 +0100 Merge tag 'debian/0.0.0+svn468-1' into jessie-backports Conflicts: debian/changelog debian/changelog | 16 + debian/control | 2 +- debian/copyright | 4 +- debian/man/mkgmap-splitter.1.xml | 2 +- doc/splitter.1 | 930 ++++++------- doc/splitter.1.xml | 1450 ++++++++++---------- doc/splitter.txt | 2 +- resources/splitter-version.properties | 4 +- src/uk/me/parabola/splitter/AbstractOSMWriter.java | 12 - src/uk/me/parabola/splitter/Area.java | 48 +- ...erDictionaryInt.java => AreaDictionaryInt.java} | 59 +- ...ctionaryShort.java => AreaDictionaryShort.java} | 140 +- .../splitter/{WriterGrid.java => AreaGrid.java} | 124 +- .../{WriterGridResult.java => AreaGridResult.java} | 8 +- .../splitter/{WriterIndex.java => AreaIndex.java} | 18 +- src/uk/me/parabola/splitter/AreaList.java | 95 +- src/uk/me/parabola/splitter/AreasCalculator.java | 422 ++++++ src/uk/me/parabola/splitter/BinaryMapWriter.java | 14 +- src/uk/me/parabola/splitter/DataStorer.java | 301 ++-- src/uk/me/parabola/splitter/KmlWriter.java | 1 + src/uk/me/parabola/splitter/Main.java | 1220 +++------------- .../me/parabola/splitter/MultiTileProcessor.java | 51 +- src/uk/me/parabola/splitter/O5mMapWriter.java | 45 +- src/uk/me/parabola/splitter/OSMFileHandler.java | 113 ++ src/uk/me/parabola/splitter/OSMWriter.java | 9 - .../me/parabola/splitter/PolygonDescProcessor.java | 18 +- .../me/parabola/splitter/ProblemListProcessor.java | 202 ++- src/uk/me/parabola/splitter/ProblemLists.java | 240 ++++ src/uk/me/parabola/splitter/PseudoOSMWriter.java | 17 +- .../parabola/splitter/SparseLong2ShortMapHuge.java | 2 +- .../splitter/SparseLong2ShortMapInline.java | 2 +- src/uk/me/parabola/splitter/SplitProcessor.java | 58 +- .../parabola/splitter/SplittableDensityArea.java | 6 +- 33 files changed, 2877 insertions(+), 2758 deletions(-) diff --cc debian/changelog index 1daa840,e2bce09..942a942 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,19 +1,25 @@@ + mkgmap-splitter (0.0.0+svn468-1) unstable; urgency=medium + + * New upstream SVN snapshot. + * Update GPL-2 or GPL-3 licensed files in copyright file. + * Drop spelling-errors.patch, applied upstream. + + -- Bas Couwenberg <[email protected]> Thu, 01 Dec 2016 18:37:09 +0100 + + mkgmap-splitter (0.0.0+svn440-1) unstable; urgency=medium + + * New upstream SVN snapshot. + * Include epoch in default-jre-headless version requirement. + * Add patch to fix spelling errors. + + -- Bas Couwenberg <[email protected]> Thu, 17 Nov 2016 07:43:04 +0100 + +mkgmap-splitter (0.0.0+svn439-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Wed, 07 Sep 2016 09:42:07 +0200 + mkgmap-splitter (0.0.0+svn439-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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
