[SCM] mapcache branch, master, updated. upstream/1.0.0-67-g63042ca

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 772135a972c93601cd3440fbba6d91e2c440a89f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 11 20:24:21 2013 +0200

    Drop obsolete patch: demo_service_page_height.patch.

diff --git a/debian/changelog b/debian/changelog
index 2fcc6c1..884b9bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
     - demo_service_html5_doctype.patch (applied upstream)
     - demo_service_html_charset.patch (applied upstream)
     - demo_service_list_newlines.patch (applied upstream)
+    - demo_service_page_height.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
 
diff --git a/debian/patches/demo_service_page_height.patch b/debian/patches/demo_service_page_height.patch
deleted file mode 100644
index 5fceade..0000000
--- a/debian/patches/demo_service_page_height.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Set the page height to allow the map div to have a relative height.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Bug: https://github.com/mapserver/mapcache/pull/74
-Applied-Upstream: 1.0.1, https://github.com/mapserver/mapcache/commit/508a5e9d24002edf05157e19ec6deeb0aa099da8
-Last-Update: 2013-06-11
---- a/lib/service_demo.c
-+++ b/lib/service_demo.c
-@@ -42,10 +42,19 @@ static char *demo_head =
-   "    <meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-   "    <title>mod-mapcache demo service</title>\n"
-   "    <style type=\"text/css\">\n"
-+  "    html, body {\n"
-+  "        height: 100%;\n"
-+  "        width: 100%;\n"
-+  "        border: 0px;\n"
-+  "        margin: 0px;\n"
-+  "        padding: 0px;\n"
-+  "    }\n"
-   "    #map {\n"
--  "    width: 100%;\n"
--  "    height: 100%;\n"
-+  "    width: calc(100%% - 2px);\n"
-+  "    height: calc(100%% - 2px);\n"
-   "    border: 1px solid black;\n"
-+  "    margin: 0px;\n"
-+  "    padding: 0px;\n"
-   "    }\n"
-   "    </style>\n"
-   "    <script src=\"http://www.openlayers.org/api/OpenLayers.js\"></script>\n"
diff --git a/debian/patches/series b/debian/patches/series
index 344be70..9743dcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 includepath.patch
-demo_service_page_height.patch
 demo_service_indenting.patch
 mapcache_seed_non_zero_exit.patch
 mapcache_seed_delete_mode.patch

-- 
Packaging for MapCache