Add Natxo Asenjo and Ralf Jungblut to the list of contributors

[privoxy.git] / debian / patches / 14_config.dpatch

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index d5bfeb0..3785d4f 100644 (file)
--- a/debian/patches/14_config.dpatch
+++ b/debian/patches/14_config.dpatch
@@ -5,19 +5,19 @@
 ## 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,6 +1,6 @@
--#        Sample Configuration File for Privoxy v3.0.10
+-#        Sample Configuration File for Privoxy v3.0.19
 +#        Sample Configuration File for Privoxy
  #
--#  $Id: config,v 1.66 2008/08/14 10:35:28 hal9 Exp $
+-#  $Id: config,v 1.98 2011/12/26 17:04:50 fabiankeil Exp $
 +#  Id: config,v
  #
- #  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+ #  Copyright (C) 2001-2011 Privoxy Developers http://www.privoxy.org/
  #
-@@ -130,7 +130,7 @@
+@@ -128,7 +128,7 @@
  #          If set, this option should be the first option in the config
  #          file, because it is used while the config file is being read.
  #
@@ -26,18 +26,7 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  1.2. trust-info-url
-@@ -166,8 +166,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
-@@ -267,7 +267,7 @@
+@@ -265,7 +265,7 @@
  #
  #      No trailing "/", please.
  #
@@ -46,7 +35,7 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  2.2. templdir
-@@ -324,7 +324,7 @@
+@@ -322,7 +322,7 @@
  #
  #      No trailing "/", please.
  #