merge Debian changes from 3.0.10 to 3.0.12.

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

diff --git a/debian/patches/14_config.dpatch b/debian/patches/14_config.dpatch
index d5bfeb0..1d2f79f 100644 (file)
--- a/debian/patches/14_config.dpatch
+++ b/debian/patches/14_config.dpatch
@@ -9,13 +9,13 @@ diff -urNad privoxy~/config privoxy/config
 --- privoxy~/config
 +++ privoxy/config
 @@ -1,6 +1,6 @@
 --- privoxy~/config
 +++ privoxy/config
 @@ -1,6 +1,6 @@

--#        Sample Configuration File for Privoxy v3.0.10
+-#        Sample Configuration File for Privoxy v3.0.12

 +#        Sample Configuration File for Privoxy
  #
 +#        Sample Configuration File for Privoxy
  #

--#  $Id: config,v 1.66 2008/08/14 10:35:28 hal9 Exp $
+-#  $Id: config,v 1.76 2009/03/21 11:51:51 fabiankeil Exp $

 +#  Id: config,v
  #
 +#  Id: config,v
  #

- #  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
+ #  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/

  #
 @@ -130,7 +130,7 @@
  #          If set, this option should be the first option in the config
  #
 @@ -130,7 +130,7 @@
  #          If set, this option should be the first option in the config


@@ -26,17 +26,6 @@ diff -urNad privoxy~/config privoxy/config
  #
  #
  #  1.2. trust-info-url
  #
  #
  #  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 @@
  #
  #      No trailing "/", please.
 @@ -267,7 +267,7 @@
  #
  #      No trailing "/", please.