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

Thu Sep 12 22:06:43 UTC 2013

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

    Drop obsolete patch: demo_service_html_charset.patch.

diff --git a/debian/changelog b/debian/changelog
index 2d1b4cb..e1359c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
     - demo_service_js_typos.patch (applied upstream)
     - demo_service_valid_js_var.patch (applied upstream)
     - demo_service_html5_doctype.patch (applied upstream)
+    - demo_service_html_charset.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
 
diff --git a/debian/patches/demo_service_html_charset.patch b/debian/patches/demo_service_html_charset.patch
deleted file mode 100644
index 7cabda6..0000000
--- a/debian/patches/demo_service_html_charset.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Add meta HTML header for Content-Type with charset.
-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
-@@ -39,6 +39,7 @@ static char *demo_head =
-   "<!DOCTYPE html>\n"
-   "<html>\n"
-   "  <head>\n"
-+  "    <meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-   "    <title>mod-mapcache demo service</title>\n"
-   "    <style type=\"text/css\">\n"
-   "    #map {\n"
-@@ -243,6 +244,7 @@ static char *demo_head_gmaps =
-   "<!DOCTYPE html>\n"
-   "<html>\n"
-   "<head>\n"
-+  "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-   "<meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" />\n"
-   "<title>mod_mapcache gmaps demo</title>\n"
-   "<style type=\"text/css\">\n"
-@@ -381,7 +383,18 @@ static char *demo_footer_gmaps =
-   "</body>\n"
-   "</html>\n";
- 
-+static char *demo_head_title =
-+  "<!DOCTYPE html>\n"
-+  "<html>\n"
-+  "<head>\n"
-+  "  <meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" />\n"
-+  "  <title>%s</title>\n"
-+  "</head>\n"
-+  "<body>\n";
- 
-+static char *demo_footer_title =
-+  "</body>\n"
-+  "</html>\n";
- 
- /**
-  * \brief parse a demo request
-@@ -427,15 +440,14 @@ void _create_demo_front(mapcache_context
-   int i;
-   char *caps;
-   req->mime_type = apr_pstrdup(ctx->pool,"text/html");
--  caps = apr_pstrdup(ctx->pool,
--                     "<html><head><title>mapcache demo landing page</title></head><body>");
-+  caps = apr_psprintf(ctx->pool,demo_head_title,"mapcache demo landing page");
-   for(i=0; i<MAPCACHE_SERVICES_COUNT; i++) {
-     mapcache_service *service = ctx->config->services[i];
-     if(!service || service->type == MAPCACHE_SERVICE_DEMO) continue; /* skip an unconfigured service, and the demo one */
-     caps = apr_pstrcat(ctx->pool,caps,"<a href=\"",urlprefix,"demo/",service->name,"\">",
-                        service->name,"</a><br/>",NULL);
-   }
--  caps = apr_pstrcat(ctx->pool,caps,"</body></html>",NULL);
-+  caps = apr_pstrcat(ctx->pool,caps,demo_footer_title,NULL);
- 
-   req->capabilities = caps;
- }
-@@ -777,8 +789,7 @@ void _create_demo_kml(mapcache_context *
-   char *caps;
-   apr_hash_index_t *tileindex_index;
-   req->mime_type = apr_pstrdup(ctx->pool,"text/html");
--  caps = apr_pstrdup(ctx->pool,
--                     "<html><head><title>mapcache kml links</title></head><body>");
-+  caps = apr_psprintf(ctx->pool,demo_head_title,"mapcache kml links");
-   tileindex_index = apr_hash_first(ctx->pool,ctx->config->tilesets);
-   while(tileindex_index) {
-     mapcache_tileset *tileset;
-@@ -800,7 +811,7 @@ void _create_demo_kml(mapcache_context *
-     tileindex_index = apr_hash_next(tileindex_index);
-   }
- 
--  caps = apr_pstrcat(ctx->pool,caps,"</body></html>",NULL);
-+  caps = apr_pstrcat(ctx->pool,caps,demo_footer_title,NULL);
-   req->capabilities = caps;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 809d3af..80c53ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 includepath.patch
-demo_service_html_charset.patch
 demo_service_list_newlines.patch
 demo_service_page_height.patch
 demo_service_indenting.patch

-- 
Packaging for MapCache

