[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3677-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 22d9c41e40608edcea571351298db453a2eba81c
Merge: b07fddc 070da86
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 12 21:46:31 2016 +0200

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

 debian/changelog                                          |  7 +++++++
 debian/control                                            | 15 +++++++--------
 resources/mkgmap-version.properties                       |  4 ++--
 .../mkgmap/reader/polish/PolishMapDataSource.java         |  9 ++++++++-
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index dcd70c7,ec433cd..35b8b33
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3677-1) unstable; urgency=medium
+ 
+   * New upstream SVN snapshot.
+   * Reorder (build) dependencies, drop obsolete qlandkarte from Suggests.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 07 Jul 2016 14:48:17 +0200
+ 
 +mkgmap (0.0.0+svn3676-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 09 May 2016 09:07:54 +0200
 +
  mkgmap (0.0.0+svn3676-1) unstable; urgency=medium
  
    * New upstream SVN snapshot.
diff --cc debian/control
index 5652c86,b12d8cd..91f3c95
--- a/debian/control
+++ b/debian/control
@@@ -6,17 -6,17 +6,17 @@@ Uploaders: Andreas Putzo <andreas at putzo
             Bas Couwenberg <sebastic at debian.org>
  Section: utils
  Priority: optional
- Build-Depends: debhelper (>= 9),
-                javahelper,
-                ant,
+ Build-Depends: ant,
+                debhelper (>= 9),
                 default-jdk,
-                time,
+                javahelper,
                 libfastutil-java,
                 libprotobuf-java,
-                libosmpbf-java
+                libosmpbf-java,
+                time
  Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mkgmap.git
 -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