[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 96c9ecf6c7dc38a5ef6135e26a43e81fe80a681a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 11 20:21:57 2013 +0200
Drop obsolete patch: demo_service_html5_doctype.patch.
diff --git a/debian/changelog b/debian/changelog
index a40774f..2d1b4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low
- libmapcache_hardening.patch (libtool no longer used)
- demo_service_js_typos.patch (applied upstream)
- demo_service_valid_js_var.patch (applied upstream)
+ - demo_service_html5_doctype.patch (applied upstream)
-- Bas Couwenberg <sebastic at xs4all.nl> Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/patches/demo_service_html5_doctype.patch b/debian/patches/demo_service_html5_doctype.patch
deleted file mode 100644
index 7bc0119..0000000
--- a/debian/patches/demo_service_html5_doctype.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Set HTML5 doctype in demo service.
-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
-@@ -36,7 +36,8 @@
- /** @{ */
-
- static char *demo_head =
-- "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
-+ "<!DOCTYPE html>\n"
-+ "<html>\n"
- " <head>\n"
- " <title>mod-mapcache demo service</title>\n"
- " <style type=\"text/css\">\n"
diff --git a/debian/patches/series b/debian/patches/series
index 79e2f68..809d3af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
includepath.patch
-demo_service_html5_doctype.patch
demo_service_html_charset.patch
demo_service_list_newlines.patch
demo_service_page_height.patch
--
Packaging for MapCache
More information about the Pkg-grass-devel
mailing list