[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3656-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 d3898aaef699de57f623b513b8c8c5e0486156ec
Merge: f949985 47511ae
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 7 20:14:51 2016 +0100

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

 debian/changelog                                               | 6 ++++++
 resources/mkgmap-version.properties                            | 4 ++--
 resources/styles/default/inc/landuse_polygons                  | 4 ++--
 resources/styles/default/lines                                 | 6 +++++-
 resources/styles/default/points                                | 2 +-
 src/uk/me/parabola/mkgmap/osmstyle/housenumber/ExtNumbers.java | 2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index a71df34,49c45f8..377cdce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ mkgmap (0.0.0+svn3656-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Jan 2016 00:32:28 +0100
+ 
 +mkgmap (0.0.0+svn3652-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 Dec 2015 17:46:32 +0100
 +
  mkgmap (0.0.0+svn3652-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