[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3625-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 25729f226c1ad1599be3d41bd2f2d6c15d4bacd9
Merge: 6c17404 10d10d5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 7 19:15:29 2015 +0200

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

 debian/changelog                                   |  7 ++++
 debian/lintian-overrides                           |  2 --
 mkgmap.iml                                         | 38 ++++++++++++++--------
 resources/mkgmap-version.properties                |  4 +--
 src/uk/me/parabola/imgfmt/app/mdr/Mdr7.java        |  3 ++
 src/uk/me/parabola/imgfmt/app/net/RoadNetwork.java |  2 +-
 .../parabola/mkgmap/osmstyle/StyledConverter.java  |  4 ++-
 7 files changed, 40 insertions(+), 20 deletions(-)

diff --cc debian/changelog
index 68cbbb8,3c452c4..7409053
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3625-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Drop unused lintian override for incompatible-java-bytecode-format.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 01 Aug 2015 12:02:32 +0200
+ 
 +mkgmap (0.0.0+svn3620-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 03 Jul 2015 14:53:02 +0200
 +
  mkgmap (0.0.0+svn3620-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