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

commit 44c70bac3e210481d7a607c3a3e56b929e1a76bd
Merge: 45eeb0c 0895070
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 6 11:48:22 2015 +0200

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

 debian/changelog                                   |  6 ++
 doc/options.txt                                    | 45 ++++++++-------
 resources/help/en/options                          | 52 ++++++++---------
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/lines                     |  2 +-
 resources/styles/default/points                    |  2 +-
 src/uk/me/parabola/mkgmap/build/LocatorConfig.java | 15 +++--
 src/uk/me/parabola/mkgmap/build/MapBuilder.java    | 57 ++++++++++++++-----
 src/uk/me/parabola/mkgmap/main/Main.java           |  4 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  | 66 +++++++++++++++++++---
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 56 ++++++++++--------
 .../mkgmap/reader/osm/POIGeneratorHook.java        | 48 +++++++++++++++-
 12 files changed, 247 insertions(+), 110 deletions(-)

diff --cc debian/changelog
index 4aef87f,7d3a39a..a39cec8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ mkgmap (0.0.0+svn3598-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Jun 2015 08:58:49 +0200
+ 
 +mkgmap (0.0.0+svn3552-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf and Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 May 2015 22:31:58 +0200
 +
  mkgmap (0.0.0+svn3552-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