X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpatches%2F14_config.dpatch;h=3785d4fedb85fc8def3fa4b47a5588c5e6fc0048;hp=1d2f79f5dcb2252b8aedbb042ba339d1755bbbc6;hb=72df7c88990336e83161ce1c47c949423a591476;hpb=4715e1ff4ca0655d4e06996ac22693b442facf66

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index 1d2f79f5..3785d4fe 100644
--- 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.12
+-#        Sample Configuration File for Privoxy v3.0.19
 +#        Sample Configuration File for Privoxy
  #
--#  $Id: config,v 1.76 2009/03/21 11:51:51 fabiankeil Exp $
+-#  $Id: config,v 1.98 2011/12/26 17:04:50 fabiankeil Exp $
 +#  Id: config,v
  #
- #  Copyright (C) 2001-2009 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,7 +26,7 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  1.2. trust-info-url
-@@ -267,7 +267,7 @@
+@@ -265,7 +265,7 @@
  #
  #      No trailing "/", please.
  #
@@ -35,7 +35,7 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  2.2. templdir
-@@ -324,7 +324,7 @@
+@@ -322,7 +322,7 @@
  #
  #      No trailing "/", please.
  #