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

commit 5f67a6dfdbaf7be96dc0138cc20eeb512bc796e9
Merge: e0aaba1 cedd704
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 13 07:20:00 2017 +0200

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

 CHANGES.txt                            |  9 +++++++++
 debian/changelog                       |  6 ++++++
 doc/conf.py                            |  2 +-
 mapproxy/image/mask.py                 |  3 +++
 mapproxy/image/transform.py            |  6 +++++-
 mapproxy/test/unit/test_conf_loader.py | 20 ++++++++++++++++++--
 mapproxy/util/geom.py                  |  3 +--
 setup.py                               |  2 +-
 8 files changed, 44 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index bc9a75c,e3328b2..e4b8677
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ mapproxy (1.10.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 07 Jul 2017 15:56:16 +0200
+ 
 +mapproxy (1.10.2-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:08:18 +0200
 +
  mapproxy (1.10.2-2) unstable; urgency=medium
  
    * Fix SOURCE_DATE_EPOCH use.

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