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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 3e2bb41c7a3bca6a75cd17764e74e65a3a1d865f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 11 20:25:22 2013 +0200

    Drop obsolete patch: demo_service_indenting.patch.

diff --git a/debian/changelog b/debian/changelog
index 884b9bc..6c16f9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
     - demo_service_html_charset.patch (applied upstream)
     - demo_service_list_newlines.patch (applied upstream)
     - demo_service_page_height.patch (applied upstream)
+    - demo_service_indenting.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
 
diff --git a/debian/patches/demo_service_indenting.patch b/debian/patches/demo_service_indenting.patch
deleted file mode 100644
index 3337f83..0000000
--- a/debian/patches/demo_service_indenting.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Use 4 space indenting in generated HTML.
-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
-@@ -50,11 +50,11 @@ static char *demo_head =
-   "        padding: 0px;\n"
-   "    }\n"
-   "    #map {\n"
--  "    width: calc(100%% - 2px);\n"
--  "    height: calc(100%% - 2px);\n"
--  "    border: 1px solid black;\n"
--  "    margin: 0px;\n"
--  "    padding: 0px;\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"
-@@ -236,7 +236,7 @@ static char *demo_control_featureinfo =
- static char *demo_footer =
-   "%s"
-   "    if(!map.getCenter())\n"
--  "     map.zoomToMaxExtent();\n"
-+  "        map.zoomToMaxExtent();\n"
-   "    map.addControl(new OpenLayers.Control.LayerSwitcher());\n"
-   "    map.addControl(new OpenLayers.Control.MousePosition());\n"
-   "}\n"
diff --git a/debian/patches/series b/debian/patches/series
index 9743dcd..be553e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 includepath.patch
-demo_service_indenting.patch
 mapcache_seed_non_zero_exit.patch
 mapcache_seed_delete_mode.patch
 mapcache_seed_typo.patch

-- 
Packaging for MapCache