From 20f2a6b2ba1ae1e3c70f38d13ad5bf5c078cbccf Mon Sep 17 00:00:00 2001 From: Emmanuel Lacour Date: Sat, 21 Nov 2009 01:50:03 +0100 Subject: [PATCH] Cleanup html docs using dpatch --- debian/control | 2 +- debian/patches/00list | 1 + debian/patches/01_doc-cleanup.dpatch | 54 ++++++++++++++++++++++++++++++++++++ debian/rules | 9 ++++-- 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 debian/patches/00list create mode 100755 debian/patches/01_doc-cleanup.dpatch diff --git a/debian/control b/debian/control index a84cf17..0f814d1 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: mod-proxy-html Section: web Priority: optional Maintainer: Emmanuel Lacour -Build-Depends: debhelper (>= 4.0.0), apache2-prefork-dev (>> 2.2), libxml2-dev (>> 2.5.10), libapache2-mod-xml2enc-dev +Build-Depends: debhelper (>= 4.0.0), apache2-prefork-dev (>> 2.2), libxml2-dev (>> 2.5.10), libapache2-mod-xml2enc-dev, dpatch Standards-Version: 3.8.0 Package: libapache2-mod-proxy-html diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..7497563 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1 @@ +01_doc-cleanup.dpatch diff --git a/debian/patches/01_doc-cleanup.dpatch b/debian/patches/01_doc-cleanup.dpatch new file mode 100755 index 0000000..157e93f --- /dev/null +++ b/debian/patches/01_doc-cleanup.dpatch @@ -0,0 +1,54 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_doc-cleanup.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove useless banner in html docs + +--- ./config.html ++++ ./config.html +@@ -234,12 +234,4 @@ in a proxy or when the contents are not HTML. This can be overridden + (at your own risk) by setting the environment variable + PROXY_HTML_FORCE (e.g. with the SetEnv directive).

+ +- ++ +--- ./faq.html ++++ ./faq.html +@@ -80,12 +80,4 @@ support nonstandard HTML variants, follow the instructions in + + + +- ++ +--- ./guide.html ++++ ./guide.html +@@ -219,12 +219,4 @@ and after, and possibly in the middle of, a page. To work around this, set the + force-response-1.0 environment variable in httpd.conf. + For example,
BrowserMatch MSIE force-response-1.0

+ +- ++ diff --git a/debian/rules b/debian/rules index 77e7b6f..743e180 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +patch: + dpatch apply-all + build: build-stamp -build-stamp: +build-stamp: patch dh_testdir apxs2 -c -I/usr/include/libxml2 mod_proxy_html.c touch build-stamp @@ -22,6 +25,8 @@ clean: rm -f build-stamp mod_proxy_html.la mod_proxy_html.lo mod_proxy_html.o mod_proxy_html.slo rm -rf .libs dh_clean + dpatch deapply-all + rm -rf debian/patched install: build dh_testdir @@ -49,4 +54,4 @@ binary-arch: build install dh_builddeb binary: binary-arch -.PHONY: build clean binary-arch binary-indep binary install +.PHONY: build clean binary-arch binary-indep binary install patch -- 2.11.0