[jmapviewer] 01/02: Merge tag 'debian/2.5+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 6f6ff938049dbbe22a2ea8ef43e94fc0091f4dba
Merge: 7ca7de1 6697e75
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 1 07:29:26 2018 +0100

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

 Readme.txt                                            |  4 ++--
 debian/changelog                                      |  8 ++++++++
 debian/control                                        |  2 +-
 debian/copyright                                      |  4 ++--
 .../gui/jmapviewer/interfaces/TileSource.java         |  7 +++++++
 .../jmapviewer/tilesources/AbstractTMSTileSource.java |  7 +++++++
 .../gui/jmapviewer/tilesources/OsmTileSource.java     |  1 +
 .../gui/jmapviewer/tilesources/TileSourceInfo.java    | 19 +++++++++++++++++++
 8 files changed, 47 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index b1d3121,1d29cdb..656d331
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ jmapviewer (2.5+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update copyright years for Dirk Stöcker & Vincent Privat.
+   * Bump Standards-Version to 4.1.3, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Jan 2018 08:44:29 +0100
+ 
 +jmapviewer (2.4+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Dec 2017 18:16:16 +0100
 +
  jmapviewer (2.4+dfsg-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index a14b1ff,b015936..ce8e28e
--- a/debian/control
+++ b/debian/control
@@@ -12,9 -12,9 +12,9 @@@ Build-Depends: debhelper (>= 9~)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 4.1.1
+ Standards-Version: 4.1.3
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/jmapviewer.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/jmapviewer.git -b stretch-backports
  Homepage: https://wiki.openstreetmap.org/wiki/JMapViewer
  
  Package: jmapviewer

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