Bug#935957: buster-pu: package mapproxy/1.11.0-3

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org at packages.debian.org
Usertags: pu

python3-mapproxy fails to serve GetCapabilities requests as reported in
#935887, this is fixed by including an upstream patch.

There was also an issue with missing symlinks for files moved from
/usr/lib/python3/dist-packages/mapproxy to /usr/share/python3-mapproxy,
this does not require changes, and is fixed by the new build on buster
(with only python3.7 instead of both python3.6 & 3.7).

The debdiff is attached.

Kind Regards,

Bas
-------------- next part --------------
diff -Nru mapproxy-1.11.0/debian/changelog mapproxy-1.11.0/debian/changelog
--- mapproxy-1.11.0/debian/changelog	2018-07-31 21:42:22.000000000 +0200
+++ mapproxy-1.11.0/debian/changelog	2019-08-28 14:08:20.000000000 +0200
@@ -1,3 +1,11 @@
+mapproxy (1.11.0-3+deb10u1) buster; urgency=medium
+
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Add upstream patch to fix WMS Capabilties with Python 3.7.
+    (closes: #935887)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Aug 2019 14:08:20 +0200
+
 mapproxy (1.11.0-3) unstable; urgency=medium
 
   * Drop autopkgtest to test installability.
diff -Nru mapproxy-1.11.0/debian/control mapproxy-1.11.0/debian/control
--- mapproxy-1.11.0/debian/control	2018-07-20 19:53:56.000000000 +0200
+++ mapproxy-1.11.0/debian/control	2019-08-28 12:12:56.000000000 +0200
@@ -38,7 +38,7 @@
                xsltproc
 Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapproxy
-Vcs-Git: https://salsa.debian.org/debian-gis-team/mapproxy.git
+Vcs-Git: https://salsa.debian.org/debian-gis-team/mapproxy.git -b buster
 Homepage: http://mapproxy.org/
 
 Package: mapproxy
diff -Nru mapproxy-1.11.0/debian/gbp.conf mapproxy-1.11.0/debian/gbp.conf
--- mapproxy-1.11.0/debian/gbp.conf	2018-07-20 19:53:56.000000000 +0200
+++ mapproxy-1.11.0/debian/gbp.conf	2019-08-28 12:12:46.000000000 +0200
@@ -6,7 +6,7 @@
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = buster
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig
diff -Nru mapproxy-1.11.0/debian/patches/0001-wms-fix-capabilities-on-Windows-for-Python-3.6.7.patch mapproxy-1.11.0/debian/patches/0001-wms-fix-capabilities-on-Windows-for-Python-3.6.7.patch
--- mapproxy-1.11.0/debian/patches/0001-wms-fix-capabilities-on-Windows-for-Python-3.6.7.patch	1970-01-01 01:00:00.000000000 +0100
+++ mapproxy-1.11.0/debian/patches/0001-wms-fix-capabilities-on-Windows-for-Python-3.6.7.patch	2019-08-28 12:13:30.000000000 +0200
@@ -0,0 +1,51 @@
+Description: wms: fix capabilities on Windows for Python >=3.6.7
+ Tempita does not correctly parses function signature on Windows with
+ recent Python versions. Likely introduced with changes in Python
+ tokenizer package with 3.6.7.. Use keyword arg as workaround.
+Author: Oliver Tonnhofer <olt at bogosoft.com>
+Origin: https://github.com/mapproxy/mapproxy/commit/81c84d47bbc77da324c36ca718fbca7dde1c1c66
+
+--- a/mapproxy/service/templates/wms100capabilities.xml
++++ b/mapproxy/service/templates/wms100capabilities.xml
+@@ -66,7 +66,7 @@
+     </Format>
+   </Exception>
+ 
+-{{def layer_capabilities(layer, with_srs)}}
++{{def layer_capabilities(layer, with_srs=False)}}
+   <Layer{{if layer.queryable}} queryable="1"{{endif}}>
+     {{if layer.name}}
+     <Name>{{ layer.name }}</Name>
+--- a/mapproxy/service/templates/wms110capabilities.xml
++++ b/mapproxy/service/templates/wms110capabilities.xml
+@@ -101,7 +101,7 @@
+   </VendorSpecificCapabilities>
+ {{endif}}
+ 
+-{{def layer_capabilities(layer, with_srs)}}
++{{def layer_capabilities(layer, with_srs=False)}}
+   <Layer{{if layer.queryable}} queryable="1"{{endif}}>
+     {{if layer.name}}
+     <Name>{{ layer.name }}</Name>
+--- a/mapproxy/service/templates/wms111capabilities.xml
++++ b/mapproxy/service/templates/wms111capabilities.xml
+@@ -113,7 +113,7 @@
+   </VendorSpecificCapabilities>
+ {{endif}}
+ 
+-{{def layer_capabilities(layer, with_srs)}}
++{{def layer_capabilities(layer, with_srs=False)}}
+   <Layer{{if layer.queryable}} queryable="1"{{endif}}>
+     {{if layer.name}}
+     <Name>{{ layer.name }}</Name>
+--- a/mapproxy/service/templates/wms130capabilities.xml
++++ b/mapproxy/service/templates/wms130capabilities.xml
+@@ -196,7 +196,7 @@
+   {{endif}}
+   </inspire_vs:ExtendedCapabilities>
+ {{endif}}
+-{{def layer_capabilities(layer, with_srs)}}
++{{def layer_capabilities(layer, with_srs=False)}}
+   {{py: md = bunch(default='', **layer.md)}}
+ 
+   <Layer{{if layer.queryable}} queryable="1"{{endif}}>
diff -Nru mapproxy-1.11.0/debian/patches/series mapproxy-1.11.0/debian/patches/series
--- mapproxy-1.11.0/debian/patches/series	2018-07-20 19:55:29.000000000 +0200
+++ mapproxy-1.11.0/debian/patches/series	2019-08-28 12:13:30.000000000 +0200
@@ -3,3 +3,4 @@
 skip-tests-for-missing-files.patch
 python3.7-async.patch
 spelling-errors.patch
+0001-wms-fix-capabilities-on-Windows-for-Python-3.6.7.patch