projects / privoxy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Adapt to CVS version as of 2006-09-17 (incl. new IPv6 patch).
[privoxy.git] / debian / patches / 15_mansection8.dpatch
diff --git a/debian/patches/15_mansection8.dpatch b/debian/patches/15_mansection8.dpatch
index 8311c66..392bd44 100644 (file)
--- 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 @@
- </refentryinfo>
- <refmeta>
-  <refentrytitle>privoxy</refentrytitle> 
-- <manvolnum>1</manvolnum>
-+ <manvolnum>8</manvolnum>
-  <refmiscinfo>
-   Privoxy &p-version;<![%p-not-stable;[ &p-status;]]>
-  </refmiscinfo>
 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) "<html><head><title>Privoxy Man page</title><link rel=\"stylesheet\" type=\"text/css\" href=\"../p_web.css\"></head><body><H2>NAME</H2>" > doc/webserver/man-page/privoxy-man-page.html
@@ -47,7 +35,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
        $(ECHO) "</body></html>" >> 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/<A .*Contents<\/A>//; s/<A .*man2html<\/A>/man2html/' tmp.html
        $(PERL) -pi.bak -e 's/(<\/HEAD>)/<LINK REL=\"STYLESHEET\" TYPE=\"text\/css\" HREF=\"..\/p_doc.css\"><\/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 @@
+ </refentryinfo>
+ <refmeta>
+  <refentrytitle>privoxy</refentrytitle> 
+- <manvolnum>1</manvolnum>
++ <manvolnum>8</manvolnum>
+  <refmiscinfo>
+   Privoxy &p-version;<![%p-not-stable;[ &p-status;]]>
+  </refmiscinfo>
The official Privoxy git repository