[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3695-1' into jessie-backports

[Bas 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 fdc8a1834f11d0b829bc9f05689ab493417ba9a3
Merge: 8ea5a55 14601b9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 7 09:48:40 2016 +0200

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

 debian/changelog                                         | 6 ++++++
 doc/options.txt                                          | 5 +++++
 resources/help/en/options                                | 5 +++++
 resources/mkgmap-version.properties                      | 4 ++--
 src/uk/me/parabola/imgfmt/FileSystemParam.java           | 9 +++++++++
 src/uk/me/parabola/imgfmt/sys/ImgHeader.java             | 9 +++++++--
 src/uk/me/parabola/mkgmap/combiners/GmapsuppBuilder.java | 4 ++++
 7 files changed, 38 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 97f3498,98a0ec7..b2aefb7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ mkgmap (0.0.0+svn3695-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 01 Oct 2016 10:13:20 +0200
+ 
 +mkgmap (0.0.0+svn3694-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Use OpenJDK 8 for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 07 Sep 2016 09:55:37 +0200
 +
  mkgmap (0.0.0+svn3694-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