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

[Bas Couwenberg]

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

    Drop obsolete patch: demo_service_valid_js_var.patch.

diff --git a/debian/changelog b/debian/changelog
index d676ef8..a40774f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
     - fixwithmapserv.patch (libtool no longer used)
     - libmapcache_hardening.patch (libtool no longer used)
     - demo_service_js_typos.patch (applied upstream)
+    - demo_service_valid_js_var.patch (applied upstream)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 11 Sep 2013 19:16:06 +0200
 
diff --git a/debian/patches/demo_service_valid_js_var.patch b/debian/patches/demo_service_valid_js_var.patch
deleted file mode 100644
index bc8a0fc..0000000
--- a/debian/patches/demo_service_valid_js_var.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Use a valid JS variable name for the WMSGetFeatureInfo control.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Bug: https://github.com/mapserver/mapcache/pull/73
-Applied-Upstream: 1.0.1, https://github.com/mapserver/mapcache/commit/b4fd0d1b6d9dda8b8e1bbe8435c20e0503e3c390
-Last-Update: 2013-06-05
---- a/lib/service_demo.c
-+++ b/lib/service_demo.c
-@@ -524,12 +524,21 @@ void _create_demo_wms(mapcache_context *
-       }
-     }
-     if(tileset->source && tileset->source->info_formats) {
-+      char *ol_layer_name;
-+
-+      ol_layer_name = apr_psprintf(ctx->pool, "%s", tileset->name);
-+      /* normalize name to something that is a valid variable name */
-+      for(i=0; i<strlen(ol_layer_name); i++)
-+        if ((!i && !isalpha(ol_layer_name[i]) && ol_layer_name[i] != '_')
-+            || (!isalnum(ol_layer_name[i]) && ol_layer_name[i] != '_'))
-+          ol_layer_name[i] = '_';
-+
-       ol_layer = apr_psprintf(ctx->pool, demo_control_featureinfo,
--                              tileset->name,
-+                              ol_layer_name,
-                               apr_pstrcat(ctx->pool,url_prefix,"?",NULL),
-                               APR_ARRAY_IDX(tileset->source->info_formats,0,char*),
--                              tileset->name,
--                              tileset->name);
-+                              ol_layer_name,
-+                              ol_layer_name);
-       caps = apr_psprintf(ctx->pool,"%s%s",caps,ol_layer);
-     }
-     tileindex_index = apr_hash_next(tileindex_index);
diff --git a/debian/patches/series b/debian/patches/series
index 59d19fa..79e2f68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 includepath.patch
-demo_service_valid_js_var.patch
 demo_service_html5_doctype.patch
 demo_service_html_charset.patch
 demo_service_list_newlines.patch

-- 
Packaging for MapCache