The following commit has been merged in the master branch: commit f7c71b8091549790395ae08c91d4e9a2cf49990e Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Sep 11 20:23:33 2013 +0200
Drop obsolete patch: demo_service_list_newlines.patch. diff --git a/debian/changelog b/debian/changelog index e1359c7..2fcc6c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low - demo_service_valid_js_var.patch (applied upstream) - demo_service_html5_doctype.patch (applied upstream) - demo_service_html_charset.patch (applied upstream) + - demo_service_list_newlines.patch (applied upstream) -- Bas Couwenberg <sebas...@xs4all.nl> Wed, 11 Sep 2013 19:16:06 +0200 diff --git a/debian/patches/demo_service_list_newlines.patch b/debian/patches/demo_service_list_newlines.patch deleted file mode 100644 index 3bcb365..0000000 --- a/debian/patches/demo_service_list_newlines.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Add newlines after each list item. -Author: Bas Couwenberg <sebas...@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 -@@ -445,7 +445,7 @@ void _create_demo_front(mapcache_context - 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); -+ service->name,"</a><br/>\n",NULL); - } - caps = apr_pstrcat(ctx->pool,caps,demo_footer_title,NULL); - -@@ -805,7 +805,7 @@ void _create_demo_kml(mapcache_context * - } - caps = apr_pstrcat(ctx->pool,caps, - "<li><a href=\"",url_prefix,"kml/",tileset->name, -- "@",grid->name,".kml\">",tileset->name,"</a></li>", -+ "@",grid->name,".kml\">",tileset->name,"</a></li>\n", - NULL); - } - tileindex_index = apr_hash_next(tileindex_index); diff --git a/debian/patches/series b/debian/patches/series index 80c53ab..344be70 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ includepath.patch -demo_service_list_newlines.patch demo_service_page_height.patch demo_service_indenting.patch mapcache_seed_non_zero_exit.patch -- Packaging for MapCache _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel