Update to the state of the official 3.0.5-beta-2 Debian package.

diff --git a/debian/changelog b/debian/changelog
index b50931c..7e23adf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
-privoxy (3.0.5~cvs20060923-1) UNRELEASED; urgency=low
+privoxy (3.0.5-beta-2) unstable; urgency=low
 
-  * New upstream CVS snapshot as of 2006-09-23.
+  * 27_remove_nsl.dpatch: Remove unnecessary linking against libnsl.
+  * 28_usermanual_slash.dpatch: Redirect http://p.p/user-manual (without
+    trailing slash) to http://p.p/user-manual/ (with trailing slash),
+    otherwise the links will be broken (Closes: #244931).
+
+ -- Roland Rosenfeld <roland@debian.org>  Sat,  7 Oct 2006 13:12:13 +0200
+
+privoxy (3.0.5-beta-1) unstable; urgency=low
+
+  * New upstream version 3.0.5-beta.
   * hide-referrer{foo} now allows everything as a forged referrer not 
     only http/https URLs and ignoring invalid URLs (Closes: #258193).  
   * Fixes the name of the filter from "popups" to "all-popups" in
@@ -28,15 +37,17 @@ privoxy (3.0.5~cvs20060923-1) UNRELEASED; urgency=low
     standard.Cautious to standard.Medium, which is similar to the old
     3.0.3 behavior and doesn't change too much (only
     filter{js-annoyances}, filter{html-annoyances} and
-    filter{unsolicited-popups} are switched off now additionally).
+    filter{unsolicited-popups} are switched off now additionally because
+    they often cause trouble by using very much CPU time).
   * 26_edit_only_writable.dpatch: Hide the edit button on
     http://p.p/show-status if action file can not be written by the
     privoxy user.
   * default.action and standard.action are no longer owned by privoxy but
     by root to show that these files are maintained upstream while users
     should maintain their local changes in global.action and user.action.
+  * Add LSB compliance to init.d script (INIT INFO and status).
 
- -- Roland Rosenfeld <roland@debian.org>  Sat, 23 Sep 2006 14:22:21 +0200
+ -- Roland Rosenfeld <roland@debian.org>  Sat, 23 Sep 2006 23:37:03 +0200
 
 privoxy (3.0.3-2-2) unstable; urgency=low
 

diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch
index 9bda321..f6e67ed 100644 (file)
--- a/debian/patches/05_defaut_action.dpatch
+++ b/debian/patches/05_defaut_action.dpatch
@@ -8,7 +8,7 @@
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -1891,3 +1891,8 @@
+@@ -1895,3 +1895,8 @@
  { +filter{js-events} }
  #MASTER# PROBLEM-URL: http://www.pharmcast.com/WarningLetters/Yr2002/December2002/J&J1202.htm
  www.pharmcast.com/

diff --git a/debian/patches/10_backup_doc.dpatch b/debian/patches/10_backup_doc.dpatch
index 39683dc..f168f82 100644 (file)
--- a/debian/patches/10_backup_doc.dpatch
+++ b/debian/patches/10_backup_doc.dpatch
@@ -6,14 +6,21 @@
 
 dpatch_patch ()
 {
-    tar cf debian/patched/doc.bak.tar \
-       doc/source doc/text doc/webserver doc/pdf \
-       INSTALL README AUTHORS privoxy.1
+    tar cf debian/patched/doc.bak.tar README
+    for i in doc/source doc/text doc/webserver doc/pdf \
+             INSTALL AUTHORS privoxy.1
+    do
+       if [ -e $i ]
+       then
+          tar rf debian/patched/doc.bak.tar $i
+       fi
+    done
 }
 
 dpatch_unpatch ()
 {
-       tar xf debian/patched/doc.bak.tar
+    rm -rf doc/pdf
+    tar xf debian/patched/doc.bak.tar
 }
 
 DPATCH_LIB_NO_DEFAULT=1

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index 58f49ad..c7eb4c9 100644 (file)
--- a/debian/patches/14_config.dpatch
+++ b/debian/patches/14_config.dpatch
@@ -9,10 +9,10 @@ diff -urNad privoxy~/config privoxy/config
 --- privoxy~/config
 +++ privoxy/config
 @@ -1,4 +1,4 @@
--#        Sample Configuration File for Privoxy v3.0.4
+-#        Sample Configuration File for Privoxy v3.0.5
 +#        Sample Configuration File for Privoxy
  #
- #  $Id: config,v 1.54 2006/09/10 14:57:25 hal9 Exp $
+ #  $Id: config,v 1.55 2006/09/23 17:59:19 david__schmidt Exp $
  #
 @@ -123,7 +123,7 @@
  #          If set, this option should be the first option in the config

diff --git a/debian/patches/19_manpage_fixup.dpatch b/debian/patches/19_manpage_fixup.dpatch
index bdb3c11..33f88bd 100755 (executable)
--- a/debian/patches/19_manpage_fixup.dpatch
+++ b/debian/patches/19_manpage_fixup.dpatch
@@ -13,7 +13,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
        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" privoxy.8; \
++      perl -pi.bak -e "s/\[ /\[/g;s/á/\\\\['a]/g;s/é/\\\\['e]/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; \
@@ -24,7 +24,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
  # 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
-+      $(PERL) -pi.bak -e "s/\['a\]/\&aacute;/g" tmp.html
++      $(PERL) -pi.bak -e "s/\['a\]/\&aacute;/g;s/\['e\]/\&eacute;/g" tmp.html
  # Get rid of spurious \a from conversion. (How to do this with perl?)
        $(SED) -e 's/\a//g' tmp.html > doc/webserver/man-page/privoxy-man-page.html && $(RM) tmp.*
  else