[jmapviewer] 01/02: Merge tag 'debian/2.3+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 4db8167a5d068ab410216dff5aee641ff9bdebd7
Merge: ee9866c 2ffab06
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 6 10:15:07 2017 +0200

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

 Readme.txt                                             |  4 ++--
 build.xml                                              |  2 +-
 debian/changelog                                       |  8 ++++++++
 debian/copyright                                       |  4 ++--
 debian/patches/series                                  |  1 -
 debian/patches/svn-r33422_handle-empty-cookies.patch   | 18 ------------------
 .../openstreetmap/gui/jmapviewer/OsmTileLoader.java    |  2 +-
 .../jmapviewer/tilesources/TemplatedTMSTileSource.java |  5 +++--
 8 files changed, 17 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index b2359d6,31d5dd5..d7ffae5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ jmapviewer (2.3+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop svn-r33422_handle-empty-cookies.patch, included upstream.
+   * Update copyright years for Paul Hartmann & Vincent Privat.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 29 Jul 2017 10:33:59 +0200
+ 
 +jmapviewer (2.2+dfsg-2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 08 Jul 2017 10:41:37 +0200
 +
  jmapviewer (2.2+dfsg-2) unstable; urgency=medium
  
    * Add upstream patch to handle empty cookies.

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