X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpatches%2F15_mansection8.dpatch;h=721f16a04bcc9682fb438a0b1d754bde8f31c713;hp=d6bb910d47cbf0b73de6e1c22ff9c213869ce283;hb=4715e1ff4ca0655d4e06996ac22693b442facf66;hpb=554c1b63903821d0ce15fe1f75f6361475dc4f6f
diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch
index d6bb910d..721f16a0 100644
--- a/debian/patches/15_mansection8.dpatch
+++ b/debian/patches/15_mansection8.dpatch
@@ -17,7 +17,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
#############################################################################
# Filenames and libraries
-@@ -514,7 +514,7 @@
+@@ -513,7 +513,7 @@
$(RM) /etc/init.d/privoxy
$(RM) /usr/sbin/privoxy
$(RM) /usr/sbin/rcprivoxy
@@ -26,7 +26,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
#############################################################################
# generic distribution
-@@ -687,7 +687,7 @@
+@@ -686,7 +686,7 @@
$(RM) doc/man/* doc/webserver/man-page/*.html
ifneq ($(MAN2HTML),false)
$(ECHO) "Privoxy Man pageNAME
" > doc/webserver/man-page/privoxy-man-page.html
@@ -35,13 +35,23 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
$(ECHO) "" >> doc/webserver/man-page/privoxy-man-page.html
else
$(MAKE) groff2html
-@@ -699,14 +699,14 @@
+@@ -698,19 +698,19 @@
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 ;\
+- perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.1; \
+- perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.1; \
+- perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.1; \
+- perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.1; \
+- perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.1; \
- $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.1 ../../../privoxy.1
+ perl -pi.bak -e 's/ //; s/\[ /\[/g' privoxy.8 ;\
++ perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/g" privoxy.8; \
++ perl -pi.bak -e "s/ö/\\\\[:o]/g" privoxy.8; \
++ perl -pi.bak -e 's/([ {])-([a-z])/$$1\\-$$2/g' privoxy.8; \
++ perl -pi.bak -e 's/ --([a-z])/ \\-\\-$$1/g' privoxy.8; \
++ perl -pi.bak -e 's/\\fB--/\\fB\\-\\-/g' privoxy.8; \
+ $(DB) ../privoxy-man-page.sgml && $(MV) -f privoxy.8 ../../../privoxy.8
# For those with man2html ala RH7s.
@@ -53,7 +63,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.
-@@ -721,7 +721,7 @@
+@@ -726,7 +726,7 @@
# Otherwise we get plain groff conversion.
groff2html:
@@ -62,7 +72,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
# readme page and INSTALL file
-@@ -1071,8 +1071,8 @@
+@@ -1079,8 +1079,8 @@
$(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $(DESTDIR)$$DOC/user-manual;\
fi
@# Not all platforms support gzipped man pages.
@@ -73,7 +83,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
-@@ -1233,7 +1233,7 @@
+@@ -1241,7 +1241,7 @@
@# man page and docs
@$(ECHO) Removing $(PROGRAM) docs
@@ -81,11 +91,11 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
+ -$(RM) $(DESTDIR)$(MAN_DEST)/privoxy.8*
-$(RM) -r $(DESTDIR)$(DOC_DEST) || $(RM) -r $(DESTDIR)$(prefix)/doc/privoxy
- @# Log and jarfile and pidfile
+ @# Log 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 @@
+@@ -58,7 +58,7 @@
privoxy