[jmapviewer] 01/02: Merge tag 'debian/2.4+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 1c3715df80de7abaea18b28aee0fcf7d77ec1119
Merge: 9f73a11 7cde07a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 2 18:16:13 2017 +0100

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

 Readme.txt                                         |  1 +
 build.xml                                          | 22 +++++++++++-----------
 debian/changelog                                   | 16 ++++++++++++++++
 debian/control                                     |  4 ++--
 debian/patches/01-build_less.patch                 |  2 +-
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 14 +++++++-------
 .../gui/jmapviewer/OsmTileLoader.java              |  5 +++++
 .../gui/jmapviewer/interfaces/TileLoader.java      | 11 +++++++++++
 8 files changed, 54 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index c08b52f,6f5a17d..8a41c7b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ jmapviewer (2.4+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches included upstream.
+     Refresh remaining patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Nov 2017 08:28:52 +0100
+ 
+ jmapviewer (2.3+dfsg-2) unstable; urgency=medium
+ 
+   * Bump Standards-Version to 4.1.1, no changes.
+   * Strip trailing whitespace from control file.
+   * Add patches from upstream SVN repository.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Nov 2017 17:41:24 +0100
+ 
 +jmapviewer (2.3+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 06 Aug 2017 10:15:11 +0200
 +
  jmapviewer (2.3+dfsg-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 7f05567,7c6b7cd..a14b1ff
--- a/debian/control
+++ b/debian/control
@@@ -12,9 -12,9 +12,9 @@@ Build-Depends: debhelper (>= 9~)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 4.0.0
+ Standards-Version: 4.1.1
  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