X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F15_mansection8.dpatch;h=7df513cbbf46b3ca95d2ea506071dfff37a53bc5;hb=dc33fcf6aa752fb4d122dbf2f111026392b5cfca;hp=944f316e620d50887fdab135bed3f58b728277a3;hpb=6aa60a252059f209c5f3fb14502ad1deff7aba61;p=privoxy.git
diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch
index 944f316e..7df513cb 100644
--- a/debian/patches/15_mansection8.dpatch
+++ b/debian/patches/15_mansection8.dpatch
@@ -5,90 +5,25 @@
## DP: Move man page from man section 1 to man section 8.
@DPATCH@
-diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
+diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
--- 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"` \
- `find doc/webserver/ -name "*.css"` \
-- privoxy.1 \
-+ privoxy.8 \
- doc/pdf/*.pdf
-
- #############################################################################
-@@ -515,7 +515,7 @@
- $(RM) /etc/init.d/privoxy
- $(RM) /usr/sbin/privoxy
- $(RM) /usr/sbin/rcprivoxy
-- $(RM) /usr/share/man/man1/privoxy.1.gz
-+ $(RM) /usr/share/man/man1/privoxy.8.gz
-
- #############################################################################
- # generic distribution
-@@ -691,7 +691,7 @@
- $(RM) doc/man/* doc/webserver/man-page/*.html
- ifneq ($(MAN2HTML),false)
- $(ECHO) "
Privoxy Man pageNAME
" > doc/webserver/man-page/privoxy-man-page.html
-- man ./privoxy.1 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html
-+ man ./privoxy.8 | $(MAN2HTML) -bare >> doc/webserver/man-page/privoxy-man-page.html
- $(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html
- else
- $(MAKE) groff2html
-@@ -703,14 +703,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 &&\
-- perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.1 ;\
-- $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.1 ../../../privoxy.1
-+ perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.8 ;\
-+ $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.8 ../../../privoxy.8
-
- # For those with man2html ala RH7s.
- man2html:
- mkdir -p doc/webserver/man-page
- ifneq ($(MAN2HTML),false)
-- $(MAN2HTML) privoxy.1 |grep -v "^Content-type" > tmp.html
-+ $(MAN2HTML) privoxy.8 |grep -v "^Content-type" > tmp.html
- $(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.
-@@ -725,7 +725,7 @@
-
- # Otherwise we get plain groff conversion.
- groff2html:
-- $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html
-+ $(G2H_CMD) ./privoxy.8 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html
-
-
- # readme page and INSTALL file
-@@ -1127,8 +1127,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
-- -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1
-+ @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.8
-+ -$(INSTALL) $(INSTALL_T) privoxy.8 $(MAN_DEST)/privoxy.8
-
- @# Change the config file default directories according to the configured ones
- @$(ECHO) Rewriting config for this installation
-@@ -1288,7 +1288,7 @@
-
- @# man page and docs
- @$(ECHO) Removing $(PROGRAM) docs
-- -$(RM) $(MAN_DEST)/privoxy.1*
-+ -$(RM) $(MAN_DEST)/privoxy.8*
- -$(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
+@@ -60,7 +60,7 @@
+ SBIN_DEST = @sbindir@
+ MAN_DIR = @mandir@
+ MAN_DEST = $(MAN_DIR)/man1
+-MAN_PAGE = privoxy.1
++MAN_PAGE = privoxy.8
+ SHARE_DEST = @datadir@
+ DOC_DEST = $(SHARE_DEST)/doc/privoxy
+ VAR_DEST = @localstatedir@
+diff -urNad '--exclude=CVS' '--exclude=.svn' 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 @@
+@@ -58,7 +58,7 @@
- privoxy
+ privoxy
- 1
+ 8