merge Debian changes from 3.0.7 to 3.0.10

[privoxy.git] / debian / patches / 19_manpage_fixup.dpatch

diff --git a/debian/patches/19_manpage_fixup.dpatch b/debian/patches/19_manpage_fixup.dpatch
index e40b360..2ddc6e0 100755 (executable)
--- a/debian/patches/19_manpage_fixup.dpatch
+++ b/debian/patches/19_manpage_fixup.dpatch
@@ -9,18 +9,19 @@
 diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
 --- privoxy~/GNUmakefile.in
 +++ privoxy/GNUmakefile.in
-@@ -704,6 +704,10 @@
+@@ -700,6 +700,11 @@
        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/ <URL:.*>//; 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.
-@@ -716,6 +720,7 @@
+@@ -712,6 +717,7 @@
  # Twice because my version of man2html is pulling in commas and periods in URLs.
        $(PERL) -pi.bak -e 's/(<A.*),(">)/$$1$$2/g' tmp.html
        $(PERL) -pi.bak -e 's,\.">,">,g' tmp.html