[mapproxy] 01/01: Add access_contraints patch ignored by .gitignore.
Bas Couwenberg
sebastic at debian.org
Mon Aug 22 09:41:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapproxy.
commit bb2f68b790b39219132af42ddd96370f5a618a20
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Aug 22 11:41:18 2016 +0200
Add access_contraints patch ignored by .gitignore.
---
debian/changelog | 6 +
...ummy-access_contraints-to-clarify-license.patch | 452 +++++++++++++++++++++
2 files changed, 458 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 877f7b3..fb2f073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mapproxy (1.9.0-3) UNRELEASED; urgency=medium
+
+ * Add access_contraints patch ignored by .gitignore.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 22 Aug 2016 11:41:13 +0200
+
mapproxy (1.9.0-2) unstable; urgency=medium
* Add upstream metadata.
diff --git a/debian/patches/0001-use-dummy-access_contraints-to-clarify-license.patch b/debian/patches/0001-use-dummy-access_contraints-to-clarify-license.patch
new file mode 100644
index 0000000..91c9c0a
--- /dev/null
+++ b/debian/patches/0001-use-dummy-access_contraints-to-clarify-license.patch
@@ -0,0 +1,452 @@
+From ec6358565121647fb89d69b5befeb340225bc990 Mon Sep 17 00:00:00 2001
+From: Oliver Tonnhofer <olt at bogosoft.com>
+Date: Thu, 4 Aug 2016 09:45:25 +0200
+Subject: use dummy access_contraints to clarify license
+
+The access_contraints option allows to document the license of the data
+that MapProxy serves. MapProxy itself does not provide any data and it's
+up to the user to add free or closed data sources.
+
+Some example and test configurations mentioned the Creative Commons
+license to show how a typical access_contraints configuration can look like.
+
+This commit removes all references to Creative Commons to make it clear that
+MapProxy and all the example and test files are _not_ licensed as
+Creative Commons.
+---
+ doc/yaml/cache_conf.yaml | 37 ++++++++++------------
+ doc/yaml/grid_conf.yaml | 7 ++--
+ doc/yaml/merged_conf.yaml | 7 ++--
+ doc/yaml/meta_conf.yaml | 7 ++--
+ doc/yaml/simple_conf.yaml | 7 ++--
+ .../config_template/base_config/full_example.yaml | 8 ++---
+ mapproxy/config_template/paster/etc/mapproxy.yaml | 12 +++----
+ mapproxy/test/system/fixture/coverage.yaml | 4 +--
+ mapproxy/test/system/fixture/formats.yaml | 4 +--
+ mapproxy/test/system/fixture/inspire.yaml | 4 +--
+ mapproxy/test/system/fixture/inspire_full.yaml | 4 +--
+ mapproxy/test/system/fixture/layer.yaml | 4 +--
+ mapproxy/test/system/fixture/legendgraphic.yaml | 4 +--
+ mapproxy/test/system/fixture/mixed_mode.yaml | 6 ++--
+ mapproxy/test/system/fixture/scalehints.yaml | 4 +--
+ mapproxy/test/system/fixture/seedonly.yaml | 4 +--
+ .../test/system/fixture/util-conf-wms-111-cap.xml | 2 +-
+ .../system/fixture/util_wms_capabilities111.xml | 2 +-
+ .../system/fixture/util_wms_capabilities130.xml | 2 +-
+ mapproxy/test/system/fixture/wms_versions.yaml | 4 +--
+ mapproxy/test/system/fixture/wmts.yaml | 4 +--
+ mapproxy/util/ext/wmsparse/test/test_parse.py | 2 +-
+ .../util/ext/wmsparse/test/wms-omniscale-111.xml | 2 +-
+ 23 files changed, 49 insertions(+), 92 deletions(-)
+
+--- a/doc/yaml/cache_conf.yaml
++++ b/doc/yaml/cache_conf.yaml
+@@ -2,26 +2,23 @@ services:
+ demo:
+ wms:
+ md:
+- title: MapProxy WMS Proxy
+- abstract: This is the fantastic MapProxy.
+- online_resource: http://mapproxy.org/
+- contact:
+- person: Your Name Here
+- position: Technical Director
+- organization:
+- address: Fakestreet 123
+- city: Somewhere
+- postcode: 12345
+- country: Germany
+- phone: +49(0)000-000000-0
+- fax: +49(0)000-000000-0
+- email: info at omniscale.de
+- access_constraints:
+- This service is intended for private and
+- evaluation use only. The data is licensed
+- as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
+- fees: 'None'
++ title: MapProxy WMS Proxy
++ abstract: This is the fantastic MapProxy.
++ online_resource: http://mapproxy.org/
++ contact:
++ person: Your Name Here
++ position: Technical Director
++ organization:
++ address: Fakestreet 123
++ city: Somewhere
++ postcode: 12345
++ country: Germany
++ phone: +49(0)000-000000-0
++ fax: +49(0)000-000000-0
++ email: info at omniscale.de
++ access_constraints:
++ Insert license and copyright information for this service.
++ fees: 'None'
+
+ sources:
+ test_wms:
+--- a/doc/yaml/grid_conf.yaml
++++ b/doc/yaml/grid_conf.yaml
+@@ -8,7 +8,7 @@ services:
+ contact:
+ person: Your Name Here
+ position: Technical Director
+- organization:
++ organization:
+ address: Fakestreet 123
+ city: Somewhere
+ postcode: 12345
+@@ -17,10 +17,7 @@ services:
+ fax: +49(0)000-000000-0
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and
+- evaluation use only. The data is licensed
+- as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ sources:
+--- a/doc/yaml/merged_conf.yaml
++++ b/doc/yaml/merged_conf.yaml
+@@ -8,7 +8,7 @@ services:
+ contact:
+ person: Your Name Here
+ position: Technical Director
+- organization:
++ organization:
+ address: Fakestreet 123
+ city: Somewhere
+ postcode: 12345
+@@ -17,10 +17,7 @@ services:
+ fax: +49(0)000-000000-0
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and
+- evaluation use only. The data is licensed
+- as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ sources:
+--- a/doc/yaml/meta_conf.yaml
++++ b/doc/yaml/meta_conf.yaml
+@@ -8,7 +8,7 @@ services:
+ contact:
+ person: Your Name Here
+ position: Technical Director
+- organization:
++ organization:
+ address: Fakestreet 123
+ city: Somewhere
+ postcode: 12345
+@@ -17,10 +17,7 @@ services:
+ fax: +49(0)000-000000-0
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and
+- evaluation use only. The data is licensed
+- as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ sources:
+--- a/doc/yaml/simple_conf.yaml
++++ b/doc/yaml/simple_conf.yaml
+@@ -8,7 +8,7 @@ services:
+ contact:
+ person: Your Name Here
+ position: Technical Director
+- organization:
++ organization:
+ address: Fakestreet 123
+ city: Somewhere
+ postcode: 12345
+@@ -17,10 +17,7 @@ services:
+ fax: +49(0)000-000000-0
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and
+- evaluation use only. The data is licensed
+- as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ sources:
+--- a/mapproxy/config_template/base_config/full_example.yaml
++++ b/mapproxy/config_template/base_config/full_example.yaml
+@@ -50,9 +50,7 @@ services:
+ email: info at omniscale.de
+ # multiline strings are possible with the right indention
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ wms:
+@@ -106,9 +104,7 @@ services:
+ email: info at omniscale.de
+ # multiline strings are possible with the right indention
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ layers:
+--- a/mapproxy/config_template/paster/etc/mapproxy.yaml
++++ b/mapproxy/config_template/paster/etc/mapproxy.yaml
+@@ -14,7 +14,7 @@ services:
+ contact:
+ person: Your Name Here
+ position: Technical Director
+- organization:
++ organization:
+ address: Fakestreet 123
+ city: Somewhere
+ postcode: 12345
+@@ -23,9 +23,7 @@ services:
+ fax: +49(0)000-000000-0
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Insert license and copyright information for this service.
+ fees: 'None'
+
+ layers:
+@@ -35,12 +33,12 @@ layers:
+ # - name: osm_full_example
+ # title: Omniscale OSM WMS - osm.omniscale.net
+ # sources: [osm_cache_full_example]
+-
++
+ caches:
+ osm_cache:
+ grids: [GLOBAL_MERCATOR, global_geodetic_sqrt2]
+ sources: [osm_wms]
+-
++
+ # osm_cache_full_example:
+ # meta_buffer: 20
+ # meta_size: [5, 5]
+@@ -77,7 +75,7 @@ sources:
+ # # # always request in this format
+ # # format: image/png
+ # map: /home/map/mapserver.map
+-
++
+
+ grids:
+ global_geodetic_sqrt2:
+--- a/mapproxy/test/system/fixture/coverage.yaml
++++ b/mapproxy/test/system/fixture/coverage.yaml
+@@ -26,9 +26,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: wms_cache
+--- a/mapproxy/test/system/fixture/formats.yaml
++++ b/mapproxy/test/system/fixture/formats.yaml
+@@ -25,9 +25,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: jpeg_cache_tiff_source
+--- a/mapproxy/test/system/fixture/inspire.yaml
++++ b/mapproxy/test/system/fixture/inspire.yaml
+@@ -41,9 +41,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+ inspire_md:
+ type: linked
+ languages:
+--- a/mapproxy/test/system/fixture/inspire_full.yaml
++++ b/mapproxy/test/system/fixture/inspire_full.yaml
+@@ -41,9 +41,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+ keyword_list:
+ - vocabulary: GEMET
+ keywords: [Orthoimagery]
+--- a/mapproxy/test/system/fixture/layer.yaml
++++ b/mapproxy/test/system/fixture/layer.yaml
+@@ -41,9 +41,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: direct
+--- a/mapproxy/test/system/fixture/legendgraphic.yaml
++++ b/mapproxy/test/system/fixture/legendgraphic.yaml
+@@ -26,9 +26,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: wms_legend
+--- a/mapproxy/test/system/fixture/mixed_mode.yaml
++++ b/mapproxy/test/system/fixture/mixed_mode.yaml
+@@ -26,13 +26,11 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: mixed_mode
+- title: cache with PNG and JPEG
++ title: cache with PNG and JPEG
+ sources: [mixed_cache]
+
+ caches:
+--- a/mapproxy/test/system/fixture/scalehints.yaml
++++ b/mapproxy/test/system/fixture/scalehints.yaml
+@@ -26,9 +26,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: res
+--- a/mapproxy/test/system/fixture/seedonly.yaml
++++ b/mapproxy/test/system/fixture/seedonly.yaml
+@@ -26,9 +26,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: wms_cache
+--- a/mapproxy/test/system/fixture/util-conf-wms-111-cap.xml
++++ b/mapproxy/test/system/fixture/util-conf-wms-111-cap.xml
+@@ -28,7 +28,7 @@
+ <ContactElectronicMailAddress>osm at omniscale.de</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>none</Fees>
+- <AccessConstraints>This service is intended for private and evaluation use only. The data is licensed as Creative Commons Attribution-Share Alike 2.0 (http://creativecommons.org/licenses/by-sa/2.0/)</AccessConstraints>
++ <AccessConstraints>Here be dragons.</AccessConstraints>
+ </Service>
+ <Capability>
+ <Request>
+--- a/mapproxy/test/system/fixture/util_wms_capabilities111.xml
++++ b/mapproxy/test/system/fixture/util_wms_capabilities111.xml
+@@ -28,7 +28,7 @@
+ <ContactElectronicMailAddress>info at omniscale.de</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>None</Fees>
+- <AccessConstraints>This service is intended for private and evaluation use only. The data is licensed as Creative Commons Attribution-Share Alike 2.0 (http://creativecommons.org/licenses/by-sa/2.0/)</AccessConstraints>
++ <AccessConstraints>Here be dragons.</AccessConstraints>
+ </Service>
+ <Capability>
+ <Request>
+--- a/mapproxy/test/system/fixture/util_wms_capabilities130.xml
++++ b/mapproxy/test/system/fixture/util_wms_capabilities130.xml
+@@ -24,7 +24,7 @@
+ <ContactElectronicMailAddress>info at omniscale.de</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>None</Fees>
+- <AccessConstraints>This service is intended for private and evaluation use only. The data is licensed as Creative Commons Attribution-Share Alike 2.0 (http://creativecommons.org/licenses/by-sa/2.0/)</AccessConstraints>
++ <AccessConstraints>Here be dragons.</AccessConstraints>
+ </Service>
+ <Capability>
+ <Request>
+--- a/mapproxy/test/system/fixture/wms_versions.yaml
++++ b/mapproxy/test/system/fixture/wms_versions.yaml
+@@ -23,9 +23,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: direct
+--- a/mapproxy/test/system/fixture/wmts.yaml
++++ b/mapproxy/test/system/fixture/wmts.yaml
+@@ -28,9 +28,7 @@ services:
+ fax: +49(0)441-9392774-9
+ email: info at omniscale.de
+ access_constraints:
+- This service is intended for private and evaluation use only.
+- The data is licensed as Creative Commons Attribution-Share Alike 2.0
+- (http://creativecommons.org/licenses/by-sa/2.0/)
++ Here be dragons.
+
+ layers:
+ - name: wms_cache
+--- a/mapproxy/util/ext/wmsparse/test/test_parse.py
++++ b/mapproxy/util/ext/wmsparse/test/test_parse.py
+@@ -14,7 +14,7 @@ class TestWMS111(object):
+ md = cap.metadata()
+ eq_(md['name'], 'OGC:WMS')
+ eq_(md['title'], 'Omniscale OpenStreetMap WMS')
+- eq_(md['access_constraints'], 'This service is intended for private and evaluation use only. The data is licensed as Creative Commons Attribution-Share Alike 2.0 (http://creativecommons.org/licenses/by-sa/2.0/)')
++ eq_(md['access_constraints'], 'Here be dragons.')
+ eq_(md['fees'], 'none')
+ eq_(md['online_resource'], 'http://omniscale.de/')
+ eq_(md['abstract'], 'Omniscale OpenStreetMap WMS (powered by MapProxy)')
+--- a/mapproxy/util/ext/wmsparse/test/wms-omniscale-111.xml
++++ b/mapproxy/util/ext/wmsparse/test/wms-omniscale-111.xml
+@@ -28,7 +28,7 @@
+ <ContactElectronicMailAddress>osm at omniscale.de</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>none</Fees>
+- <AccessConstraints>This service is intended for private and evaluation use only. The data is licensed as Creative Commons Attribution-Share Alike 2.0 (http://creativecommons.org/licenses/by-sa/2.0/)</AccessConstraints>
++ <AccessConstraints>Here be dragons.</AccessConstraints>
+ </Service>
+ <Capability>
+ <Request>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapproxy.git
More information about the Pkg-grass-devel
mailing list