X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpatches%2F15_mansection8.dpatch;h=392bd4400ab2d1b74e5a70394b393187b8015768;hp=8311c66762c4417793ee8cf59e2ff90c956ab0dc;hb=20a28003d9d4f3c5af30eea34423493a8783e518;hpb=72081f829de368392d04076728f8c991178c0080 diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch index 8311c667..392bd440 100644 --- a/debian/patches/15_mansection8.dpatch +++ b/debian/patches/15_mansection8.dpatch @@ -5,21 +5,9 @@ ## DP: Move man page from man section 1 to man section 8. @DPATCH@ -diff -urNad privoxy~/doc/source/privoxy-man-page.sgml privoxy/doc/source/privoxy-man-page.sgml ---- privoxy~/doc/source/privoxy-man-page.sgml 2006-02-11 23:44:40.000000000 +0100 -+++ privoxy/doc/source/privoxy-man-page.sgml 2006-02-11 23:44:40.000000000 +0100 -@@ -57,7 +57,7 @@ - - - privoxy -- 1 -+ 8 - - Privoxy &p-version; - diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in ---- privoxy~/GNUmakefile.in 2006-02-11 23:44:25.000000000 +0100 -+++ privoxy/GNUmakefile.in 2006-02-11 23:44:40.000000000 +0100 +--- privoxy~/GNUmakefile.in ++++ privoxy/GNUmakefile.in @@ -177,7 +177,7 @@ `find doc/text/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS"` \ `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html"` \ @@ -29,7 +17,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in doc/pdf/*.pdf ############################################################################# -@@ -520,7 +520,7 @@ +@@ -521,7 +521,7 @@ $(RM) /etc/init.d/privoxy $(RM) /usr/sbin/privoxy $(RM) /usr/sbin/rcprivoxy @@ -38,7 +26,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in ############################################################################# # generic distribution -@@ -692,7 +692,7 @@ +@@ -697,7 +697,7 @@ $(RM) doc/man/* doc/webserver/man-page/*.html ifneq ($(MAN2HTML),false) $(ECHO) "Privoxy Man page

NAME

" > doc/webserver/man-page/privoxy-man-page.html @@ -47,7 +35,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html else $(MAKE) groff2html -@@ -704,14 +704,14 @@ +@@ -709,14 +709,14 @@ man: dok-release mkdir -p doc/source/temp && cd doc/source/temp && $(RM) * ;\ nsgmls ../privoxy-man-page.sgml | sgmlspl ../../../utils/docbook2man/docbook2man-spec.pl &&\ @@ -65,7 +53,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in $(PERL) -pi.bak -e 's///; s//man2html/' tmp.html $(PERL) -pi.bak -e 's/(<\/HEAD>)/<\/HEAD>/' tmp.html # Twice because my version of man2html is pulling in commas and periods in URLs. -@@ -726,7 +726,7 @@ +@@ -731,7 +731,7 @@ # Otherwise we get plain groff conversion. groff2html: @@ -74,8 +62,8 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in # readme page and INSTALL file -@@ -1122,8 +1122,8 @@ - $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\ +@@ -1129,8 +1129,8 @@ + $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\ fi @# Not all platforms support gzipped man pages. - @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 @@ -85,7 +73,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in @# Change the config file default directories according to the configured ones @$(ECHO) Rewriting config for this installation -@@ -1273,7 +1273,7 @@ +@@ -1290,7 +1290,7 @@ @# man page and docs @$(ECHO) Removing $(PROGRAM) docs @@ -94,3 +82,15 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy @# Log and jarfile and pidfile +diff -urNad privoxy~/doc/source/privoxy-man-page.sgml privoxy/doc/source/privoxy-man-page.sgml +--- privoxy~/doc/source/privoxy-man-page.sgml ++++ privoxy/doc/source/privoxy-man-page.sgml +@@ -57,7 +57,7 @@ + + + privoxy +- 1 ++ 8 + + Privoxy &p-version; +