[jmapviewer] 01/02: Merge tag 'debian/2.6+dfsg-1' into stretch-backports

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch stretch-backports
in repository jmapviewer.

commit 9f42755b448c592ff00d6be217c1ecdd471bd5c3
Merge: d77cfe1 7dbb7b6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 7 07:12:01 2018 +0100

    Merge tag 'debian/2.6+dfsg-1' into stretch-backports

 debian/changelog                                               |  6 ++++++
 src/org/openstreetmap/gui/jmapviewer/JMapViewer.java           | 10 ++++++++++
 .../gui/jmapviewer/tilesources/TileSourceInfo.java             |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 82f2bd4,743fa6e..0ba0387
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ jmapviewer (2.6+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Mar 2018 16:00:03 +0100
+ 
 +jmapviewer (2.5+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Feb 2018 07:29:33 +0100
 +
  jmapviewer (2.5+dfsg-1) unstable; urgency=medium
  
    * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git