[jmapviewer] 01/02: Merge tag 'debian/2.2+dfsg-2' 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 38ee15ad0d9ede110a0c8233b7492e5c8f43ccbe
Merge: bfb6c22 8af26e1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 8 10:40:13 2017 +0200

    Merge tag 'debian/2.2+dfsg-2' into stretch-backports

 debian/changelog                                     |  9 +++++++++
 debian/control                                       |  2 +-
 debian/patches/series                                |  1 +
 debian/patches/svn-r33422_handle-empty-cookies.patch | 18 ++++++++++++++++++
 debian/rules                                         |  4 +++-
 debian/tests/control                                 |  3 +++
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index fbf4c7f,7cdb7d8..2194798
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
+ jmapviewer (2.2+dfsg-2) unstable; urgency=medium
+ 
+   * Add upstream patch to handle empty cookies.
+   * Bump Standards-Version to 4.0.0, no changes.
+   * Add autopkgtest to test installability.
+   * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 01 Jul 2017 11:19:58 +0200
+ 
 +jmapviewer (2.2+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Jun 2017 09:21:54 +0200
 +
  jmapviewer (2.2+dfsg-1) unstable; urgency=medium
  
    * Move from experimental to unstable.
diff --cc debian/control
index e534a62,05b76f9..7f05567
--- a/debian/control
+++ b/debian/control
@@@ -12,9 -12,9 +12,9 @@@ Build-Depends: debhelper (>= 9~)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 3.9.8
+ Standards-Version: 4.0.0
  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