X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F14_config.dpatch;h=3785d4fedb85fc8def3fa4b47a5588c5e6fc0048;hb=cd1a3b9bf3680c2213277af0dba6241772e2e186;hp=5e7d20e74e2ee2e4445f7275b125abca77a12fab;hpb=60b84734caeb5cc110a3d0ec27351f33f5044dc0;p=privoxy.git

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index 5e7d20e7..3785d4fe 100644
--- a/debian/patches/14_config.dpatch
+++ b/debian/patches/14_config.dpatch
@@ -5,14 +5,17 @@
 ## DP: Several Debian specific changes to config file
 
 @DPATCH@
-diff -urNad privoxy~/config privoxy/config
+diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/config privoxy/config
 --- privoxy~/config
 +++ privoxy/config
-@@ -1,4 +1,4 @@
--#        Sample Configuration File for Privoxy v3.0.7
+@@ -1,6 +1,6 @@
+-#        Sample Configuration File for Privoxy v3.0.19
 +#        Sample Configuration File for Privoxy
  #
- #  $Id: config,v 1.59 2007/11/15 02:46:31 hal9 Exp $
+-#  $Id: config,v 1.98 2011/12/26 17:04:50 fabiankeil Exp $
++#  Id: config,v
+ #
+ #  Copyright (C) 2001-2011 Privoxy Developers http://www.privoxy.org/
  #
 @@ -128,7 +128,7 @@
  #          If set, this option should be the first option in the config
@@ -23,18 +26,7 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  1.2. trust-info-url
-@@ -163,8 +163,8 @@
- #      don't end up locked out from the information on why they were
- #      locked out in the first place!
- #
--trust-info-url  http://www.example.com/why_we_block.html
--trust-info-url  http://www.example.com/what_we_allow.html
-+#trust-info-url  http://www.example.com/why_we_block.html
-+#trust-info-url  http://www.example.com/what_we_allow.html
- #
- #
- #  1.3. admin-address
-@@ -260,7 +260,7 @@
+@@ -265,7 +265,7 @@
  #
  #      No trailing "/", please.
  #
@@ -43,7 +35,7 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  2.2. templdir
-@@ -315,7 +315,7 @@
+@@ -322,7 +322,7 @@
  #
  #      No trailing "/", please.
  #
@@ -52,12 +44,3 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  2.4. actionsfile
-@@ -609,7 +609,7 @@
- #      it's reached, messages are logged truncated and marked with
- #      "... [too long, truncated]".
- #
--debug   1    # show each GET/POST/CONNECT request
-+#debug   1    # show each GET/POST/CONNECT request
- debug   4096 # Startup banner and warnings
- debug   8192 # Errors - *we highly recommended enabling this*
- #