[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3660-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 e4c2fe4d1431163e308775522949a2edfe35bfab
Merge: 653d069 3e852a1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Feb 7 18:42:50 2016 +0100

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

 debian/changelog                                   |   7 +
 debian/control                                     |   2 +-
 doc/options.txt                                    | 368 +++++++++++----------
 resources/help/en/options                          |  10 +-
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/name                  |   8 +-
 scripts/download/mkdoc                             |   3 +
 src/uk/me/parabola/imgfmt/app/Coord.java           |   2 +
 src/uk/me/parabola/imgfmt/app/net/RouteNode.java   |   5 +
 .../mkgmap/osmstyle/housenumber/ExtNumbers.java    |  11 +-
 .../osmstyle/housenumber/HousenumberGroup.java     |   4 +
 11 files changed, 226 insertions(+), 198 deletions(-)

diff --cc debian/changelog
index b9c4ce7,1ade131..ca4413c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3660-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Update Vcs-Git URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Feb 2016 14:48:01 +0100
+ 
 +mkgmap (0.0.0+svn3656-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Jan 2016 20:14:56 +0100
 +
  mkgmap (0.0.0+svn3656-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 65f2182,d026559..387a91c
--- a/debian/control
+++ b/debian/control
@@@ -16,7 -16,7 +16,7 @@@ Build-Depends: debhelper (>= 9)
                 libosmpbf-java
  Standards-Version: 3.9.6
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap.git -b jessie-backports
 -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