This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapproxy.
commit 518740515a857ef1b52d6fd7370448e8f7895a31 Author: Bas Couwenberg <[email protected]> Date: Thu May 18 18:49:19 2017 +0200 Drop patches applied upstream. --- debian/changelog | 1 + ...ummy-access_contraints-to-clarify-license.patch | 452 --------------------- debian/patches/configuration-typo.patch | 16 - debian/patches/offline-tests.patch | 8 +- debian/patches/series | 2 - 5 files changed, 5 insertions(+), 474 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15c72c0..48ed83b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mapproxy (1.10.0-1) UNRELEASED; urgency=medium * New upstream release. * Add python{,3}-redis to (build) dependencies. + * Drop patches applied upstream. -- Bas Couwenberg <[email protected]> Thu, 18 May 2017 18:36:20 +0200 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 deleted file mode 100644 index 91c9c0a..0000000 --- a/debian/patches/0001-use-dummy-access_contraints-to-clarify-license.patch +++ /dev/null @@ -1,452 +0,0 @@ -From ec6358565121647fb89d69b5befeb340225bc990 Mon Sep 17 00:00:00 2001 -From: Oliver Tonnhofer <[email protected]> -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: [email protected] -- 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: [email protected] -+ 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - # 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: [email protected] - # 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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: [email protected] - 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>[email protected]</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>[email protected]</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>[email protected]</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: [email protected] - 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: [email protected] - 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>[email protected]</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> diff --git a/debian/patches/configuration-typo.patch b/debian/patches/configuration-typo.patch deleted file mode 100644 index 0759e0c..0000000 --- a/debian/patches/configuration-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix 'configration' typo, replace with 'configuration'. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/mapproxy/mapproxy/pull/248 -Applied-Upstream: https://github.com/mapproxy/mapproxy/commit/cd72d3486d30032d6edce65bd95010710dd05f72 - ---- a/doc/seed.rst -+++ b/doc/seed.rst -@@ -21,7 +21,7 @@ Options - - .. option:: -s <seed.yaml>, --seed-conf==<seed.yaml> - -- The seed configuration. You can also pass the configration as the last argument to ``mapproxy-seed`` -+ The seed configuration. You can also pass the configuration as the last argument to ``mapproxy-seed`` - - .. option:: -f <mapproxy.yaml>, --proxy-conf=<mapproxy.yaml> - diff --git a/debian/patches/offline-tests.patch b/debian/patches/offline-tests.patch index 18f6ff4..a334461 100644 --- a/debian/patches/offline-tests.patch +++ b/debian/patches/offline-tests.patch @@ -82,7 +82,7 @@ Forwarded: https://github.com/mapproxy/mapproxy/pull/246 TEST_SERVER_ADDRESS = ('127.0.0.1', 56413) GLOBAL_GEOGRAPHIC_EXTENT = MapExtent((-180, -90, 180, 90), SRS(4326)) -@@ -680,6 +681,9 @@ class TestWMSSourceWithClient(object): +@@ -744,6 +745,9 @@ class TestWMSSourceWithClient(object): self.source = WMSSource(self.client) def test_get_map(self): @@ -92,7 +92,7 @@ Forwarded: https://github.com/mapproxy/mapproxy/pull/246 with tmp_image((512, 512)) as img: expected_req = ({'path': r'/service?LAYERS=foo&SERVICE=WMS&FORMAT=image%2Fpng' '&REQUEST=GetMap&HEIGHT=512&SRS=EPSG%3A4326&styles=' -@@ -693,6 +697,9 @@ class TestWMSSourceWithClient(object): +@@ -757,6 +761,9 @@ class TestWMSSourceWithClient(object): assert is_png(result.as_buffer(seekable=True)) eq_(result.as_image().size, (512, 512)) def test_get_map_non_image_content_type(self): @@ -102,7 +102,7 @@ Forwarded: https://github.com/mapproxy/mapproxy/pull/246 with tmp_image((512, 512)) as img: expected_req = ({'path': r'/service?LAYERS=foo&SERVICE=WMS&FORMAT=image%2Fpng' '&REQUEST=GetMap&HEIGHT=512&SRS=EPSG%3A4326&styles=' -@@ -707,6 +714,9 @@ class TestWMSSourceWithClient(object): +@@ -771,6 +778,9 @@ class TestWMSSourceWithClient(object): else: assert False, 'no SourceError raised' def test_basic_auth(self): @@ -112,7 +112,7 @@ Forwarded: https://github.com/mapproxy/mapproxy/pull/246 http_client = HTTPClient(self.req_template.url, username='foo', password='bar@') self.client.http_client = http_client def assert_auth(req_handler): -@@ -873,4 +883,4 @@ class TestNeastedConditionalLayers(objec +@@ -937,4 +947,4 @@ class TestNeastedConditionalLayers(objec assert self.l4326.requested def test_resolution_low_projected(self): self.layer.get_map(MapQuery((0, 0, 10000, 10000), (100, 100), SRS(31467))) diff --git a/debian/patches/series b/debian/patches/series index 7ff43d8..1d69a20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ offline-tests.patch -0001-use-dummy-access_contraints-to-clarify-license.patch disable-tag_date.patch -configuration-typo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapproxy.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
