Commits

Oliver Tonnhofer committed 2205633 Merge

merge with 1.1.x

  • Participants
  • Parent commits d28932b, 799e205

Comments (0)

Files changed (3)

File debian/changelog

+mapproxy (1.1.2) unstable; urgency=low
+
+  * First debian release.
+
+ -- Bjoern Schilberg <bjoern.schilberg@intevation.de>  Fri, 24 Jun 2011 09:49:44 +0200
+
 mapproxy (1.1.0) unstable; urgency=low
 
   * Initial release of the debian-files

File debian/control

 Package: mapproxy
 Architecture: all
 Homepage: http://www.mapproxy.org
-Depends: ${misc:Depends}, ${python:Depends},  python-imaging, python-yaml, libproj0, ttf-dejavu, ttf-dejavu-extra
+Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-setuptools, python-imaging, python-yaml, libproj0, ttf-dejavu, ttf-dejavu-extra
 Suggests: python-lxml, python-shapely, python-pastedeploy, libgdal1
 Description: This programm MapProxy is an open source proxy for geospatial data. It caches,
  accelerates and transforms data from existing map services and serves any

File mapproxy/config/spec.py

 
 http_opts = {
     'method': str(),
-    'timeout': number(),
+    'client_timeout': number(),
     'ssl_no_cert_checks': bool(),
+    'ssl_ca_certs': str(),
+    'headers': {
+        anything(): str()
+    },
 }
+
 mapserver_opts = {
     'binary': str(),
     'working_dir': str(),
             },
             'font_dir': str(),
         },
-        'http': {
-            'timeout': number(),
-        },
+        'http': http_opts,
         'cache': {
             'base_dir': str(),
             'lock_dir': str(),
           'axis_order_en': [str()],
           'proj_data_dir': str(),
         },
+        'tiles': {
+            'expires_hours': number(),
+        },
         'mapserver': mapserver_opts,
     },
     'grids': {