[mapserver] 01/02: Merge tag 'debian/7.0.7-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 mapserver.

commit 4fe87e41ad7ac3b1c1e261e3de18ba97682839df
Merge: 3db85ca 5f9d85b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 21 07:26:37 2017 +0100

    Merge tag 'debian/7.0.7-1' into stretch-backports

 CMakeLists.txt                  |   2 +-
 debian/changelog                |  74 +++++++++++--------
 debian/control                  |   3 +-
 debian/libmapserver2.symbols    |  24 +++---
 debian/rules                    |   2 +-
 debian/source.lintian-overrides |   6 ++
 mapcairo.c                      |   1 +
 mapcopy.c                       |   1 +
 mapdraw.c                       | 159 +++++++++++++++++++++++++++++++++-------
 mapfile.c                       |  20 +++++
 maphttp.c                       |   5 --
 mapimageio.c                    |  15 ++--
 maplayer.c                      |  12 ++-
 mapogcsld.c                     |   2 +-
 mapogcsos.c                     |   3 +-
 mapogroutput.c                  |  13 +++-
 maporaclespatial.c              |  10 +--
 mapproject.c                    |  79 +++++++++++++++-----
 mapproject.h                    |   2 +
 maprasterquery.c                |   2 +-
 mapregex.c                      |   2 +-
 maprendering.c                  |   5 +-
 mapresample.c                   |  49 +++++++++----
 mapscript/csharp/CMakeLists.txt |   6 +-
 mapserver.h                     |  10 +++
 maputil.c                       |   8 ++
 mapuvraster.c                   |  59 +++++++++++++--
 mapwcs11.c                      |  20 +++--
 mapwcs20.c                      |  36 +++++----
 mapwfslayer.c                   |   2 +-
 30 files changed, 471 insertions(+), 161 deletions(-)

diff --cc debian/changelog
index 8c7202b,9f44d62..d644f55
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,22 @@@
+ mapserver (7.0.7-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Change priority from extra to optional.
+   * Bump Standards-Version to 4.1.1, changes: priority.
+   * Strip trailing whitespace from changelog & rules.
+   * Add lintian override for debian-watch-uses-insecure-uri.
+   * Add lintian override for python-foo-but-no-python3-foo.
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 15 Nov 2017 21:00:35 +0100
+ 
 +mapserver (7.0.6-2~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Jul 2017 13:24:24 +0200
 +
  mapserver (7.0.6-2) unstable; urgency=medium
  
    * Fix SOURCE_DATE_EPOCH use.
diff --cc debian/control
index a202e6c,a76c8a0..50abd0b
--- a/debian/control
+++ b/debian/control
@@@ -45,9 -45,9 +45,9 @@@ Build-Depends: debhelper (>= 9)
                 docbook-xml,
                 xsltproc
  Build-Conflicts: libcurl3-openssl-dev
- Standards-Version: 4.0.0
+ Standards-Version: 4.1.1
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapserver.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/mapserver.git -b stretch-backports
  Homepage: http://www.mapserver.org
  XS-Ruby-Versions: all
  

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