[SCM] mapcache branch, master, updated. upstream/1.0.0-67-g63042ca
Bas Couwenberg
sebastic at xs4all.nl
Thu Sep 12 22:06:42 UTC 2013
The following commit has been merged in the master branch:
commit d10c4cfb9c5741fb08de9e8259562dab12b75439
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 11 20:19:24 2013 +0200
Drop obsolete patch: demo_service_js_typos.patch.
diff --git a/debian/changelog b/debian/changelog
index 6fd85b1..d676ef8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
* Drop patches:
- fixwithmapserv.patch (libtool no longer used)
- libmapcache_hardening.patch (libtool no longer used)
+ - demo_service_js_typos.patch (applied upstream)
-- Bas Couwenberg <sebastic at xs4all.nl> Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/patches/demo_service_js_typos.patch b/debian/patches/demo_service_js_typos.patch
deleted file mode 100644
index 5112a82..0000000
--- a/debian/patches/demo_service_js_typos.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Terminate function calls with a semicolon.
-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
-@@ -133,7 +133,7 @@ static char *demo_layer_wms =
- " sphericalMercator: %s\n"
- " }\n"
- " );\n"
-- " map.addLayer(%s_wms_layer)\n\n";
-+ " map.addLayer(%s_wms_layer);\n\n";
-
- static char *demo_layer_tms =
- " var %s_tms_layer = new OpenLayers.Layer.TMS( \"%s-%s-TMS\",\n"
-@@ -149,7 +149,7 @@ static char *demo_layer_tms =
- " sphericalMercator: %s\n"
- " }\n"
- " );\n"
-- " map.addLayer(%s_tms_layer)\n\n";
-+ " map.addLayer(%s_tms_layer);\n\n";
-
- static char *demo_layer_wmts =
- " var %s_wmts_layer = new OpenLayers.Layer.WMTS({\n"
-@@ -168,7 +168,7 @@ static char *demo_layer_wmts =
- " sphericalMercator: %s\n"
- " }\n"
- " );\n"
-- " map.addLayer(%s_wmts_layer)\n\n";
-+ " map.addLayer(%s_wmts_layer);\n\n";
-
- static char *demo_layer_ve =
- " var %s_ve_layer = new OpenLayers.Layer.TMS( \"%s-%s-VE\",\n"
-@@ -183,10 +183,10 @@ static char *demo_layer_ve =
- " sphericalMercator: %s\n"
- " }\n"
- " );\n"
-- " map.addLayer(%s_ve_layer)\n\n";
-+ " map.addLayer(%s_ve_layer);\n\n";
-
- static char *demo_layer_singletile =
-- " var %s_slayer = new OpenLayers.Layer.WMS( \"%s-%s (singleTile)\",\n"
-+ " var %s_slayer = new OpenLayers.Layer.WMS( \"%s-%s (singleTile);\",\n"
- " \"%s\",{layers: '%s'},\n"
- " { gutter:0,ratio:1,isBaseLayer:true,transitionEffect:'resize',\n"
- " resolutions:[%s],\n"
-@@ -197,7 +197,7 @@ static char *demo_layer_singletile =
- " sphericalMercator: %s\n"
- " }\n"
- " );\n"
-- " map.addLayer(%s_slayer)\n\n";
-+ " map.addLayer(%s_slayer);\n\n";
-
- static char *demo_control_featureinfo =
- " var %s_info = new OpenLayers.Control.WMSGetFeatureInfo({\n"
-@@ -219,7 +219,7 @@ static char *demo_control_featureinfo =
- " }\n"
- " });\n"
- " map.addControl(%s_info);\n"
-- " %s_info.activate()\n\n";
-+ " %s_info.activate();\n\n";
-
-
- static char *demo_footer =
diff --git a/debian/patches/series b/debian/patches/series
index f32078f..59d19fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
includepath.patch
-demo_service_js_typos.patch
demo_service_valid_js_var.patch
demo_service_html5_doctype.patch
demo_service_html_charset.patch
--
Packaging for MapCache
More information about the Pkg-grass-devel
mailing list