[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3668-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 b9fbb2fb91481e468e6ee84b3a4cf5d8ed40dfee
Merge: 7386aae 5307ee5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 6 17:45:06 2016 +0100

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

 debian/changelog                                   |  7 ++
 debian/control                                     |  2 +-
 doc/options.txt                                    | 19 ++++--
 resources/help/en/options                          | 22 +++---
 resources/mkgmap-version.properties                |  4 +-
 resources/styles/default/inc/access                | 22 +++---
 resources/styles/default/lines                     | 38 +++++------
 .../me/parabola/imgfmt/app/net/NumberPreparer.java | 79 +++++++++++-----------
 src/uk/me/parabola/imgfmt/app/net/RouteNode.java   |  1 -
 .../parabola/mkgmap/osmstyle/RuleFileReader.java   |  2 +
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  4 ++
 .../mkgmap/reader/osm/LinkDestinationHook.java     | 59 +++++++++++-----
 .../parabola/mkgmap/reader/osm/SeaGenerator.java   | 15 ++--
 .../mkgmap/reader/osm/boundary/BoundaryMerger.java | 12 ++--
 .../mkgmap/reader/osm/boundary/BoundaryUtil.java   |  7 +-
 .../mkgmap/osmstyle/RuleFileReaderTest.java        | 45 ++++++++++++
 16 files changed, 215 insertions(+), 123 deletions(-)

diff --cc debian/changelog
index 37ef0fd,50ce12e..41309cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3668-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Bump Standards-Version to 3.9.7, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 01 Mar 2016 06:38:47 +0100
+ 
 +mkgmap (0.0.0+svn3660-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 07 Feb 2016 18:42:54 +0100
 +
  mkgmap (0.0.0+svn3660-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 387a91c,15e0e1d..a4e27de
--- a/debian/control
+++ b/debian/control
@@@ -14,9 -14,9 +14,9 @@@ Build-Depends: debhelper (>= 9)
                 libfastutil-java,
                 libprotobuf-java,
                 libosmpbf-java
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mkgmap.git -b jessie-backports
  Homepage: http://www.mkgmap.org.uk
  
  Package: mkgmap

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git