[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3639-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 e3d9514b1bdca727cb54c79e134681f5a47dd335
Merge: 894c5c2 8918e06
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 7 08:13:26 2015 +0200

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

 debian/changelog                                   |   7 +
 debian/control                                     |   2 +-
 resources/mkgmap-version.properties                |   4 +-
 resources/styles/default/inc/roadspeed             |   2 +-
 .../me/parabola/imgfmt/app/net/NumberPreparer.java |   5 -
 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java |  15 +-
 src/uk/me/parabola/mkgmap/Options.java             |   6 +-
 .../me/parabola/mkgmap/osmstyle/ConvertedWay.java  |  54 ++--
 .../mkgmap/osmstyle/housenumber/ExtNumbers.java    |   8 +-
 .../osmstyle/housenumber/HousenumberElem.java      |   9 +
 .../osmstyle/housenumber/HousenumberGenerator.java | 314 +++++----------------
 .../osmstyle/housenumber/HousenumberIvl.java       | 106 ++++++-
 .../osmstyle/housenumber/HousenumberMatch.java     |   3 +-
 .../osmstyle/housenumber/HousenumberRoad.java      |  16 +-
 .../mkgmap/reader/osm/HousenumberHooks.java        |   1 -
 .../mkgmap/reader/osm/RestrictionRelation.java     |  28 +-
 test/func/ArgsTest.java                            |   2 +
 test/uk/me/parabola/mkgmap/CommandArgsTest.java    |   8 +-
 18 files changed, 259 insertions(+), 331 deletions(-)

diff --cc debian/changelog
index daed515,06bff07..77a72b5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3639-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Update Vcs-Browser URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 01 Sep 2015 15:45:17 +0200
+ 
 +mkgmap (0.0.0+svn3625-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 07 Aug 2015 19:15:45 +0200
 +
  mkgmap (0.0.0+svn3625-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 593c03a,aee12a0..65f2182
--- a/debian/control
+++ b/debian/control
@@@ -15,8 -15,8 +15,8 @@@ Build-Depends: debhelper (>= 9)
                 libprotobuf-java,
                 libosmpbf-java
  Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
 -Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap.git
 +Vcs-Git: git://anonscm.debian.org/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