This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie-backports in repository mkgmap.
commit 8368bb4097f41e51c82cf57f75ea0f65bd5f4996 Merge: e4de94c a59fe05 Author: Bas Couwenberg <[email protected]> Date: Wed Dec 7 18:49:00 2016 +0100 Merge tag 'debian/0.0.0+svn3706-1' into jessie-backports Conflicts: debian/changelog debian/changelog | 6 + doc/options.txt | 8 ++ doc/styles/internal-tags.txt | 3 +- resources/help/en/options | 6 + resources/mkgmap-version.properties | 4 +- resources/styles/default/inc/water_polygons | 2 +- src/uk/me/parabola/imgfmt/app/Area.java | 70 +++++++--- src/uk/me/parabola/mkgmap/build/MapArea.java | 146 ++++++++++++++++++++- src/uk/me/parabola/mkgmap/build/MapBuilder.java | 28 +++- src/uk/me/parabola/mkgmap/build/MapSplitter.java | 28 ++-- .../parabola/mkgmap/filters/ShapeMergeFilter.java | 7 +- src/uk/me/parabola/mkgmap/general/LevelInfo.java | 4 +- src/uk/me/parabola/mkgmap/general/MapShape.java | 19 +++ .../parabola/mkgmap/osmstyle/StyledConverter.java | 21 +++ src/uk/me/parabola/mkgmap/osmstyle/TypeReader.java | 4 +- .../mkgmap/osmstyle/function/AreaSizeFunction.java | 23 +++- .../mkgmap/reader/osm/MultiPolygonRelation.java | 4 + .../parabola/mkgmap/reader/osm/SeaGenerator.java | 16 ++- src/uk/me/parabola/mkgmap/reader/osm/Way.java | 15 +++ .../mkgmap/filters/ShapeMergeFilterTest.java | 2 +- 20 files changed, 365 insertions(+), 51 deletions(-) diff --cc debian/changelog index 7c57de0,176cac1..00fbb1b --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,15 @@@ + mkgmap (0.0.0+svn3706-1) unstable; urgency=medium + + * New upstream SVN snapshot. + + -- Bas Couwenberg <[email protected]> Thu, 01 Dec 2016 18:38:57 +0100 + +mkgmap (0.0.0+svn3701-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + + -- Bas Couwenberg <[email protected]> Tue, 08 Nov 2016 07:30:02 +0100 + mkgmap (0.0.0+svn3701-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.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
