Update Debian patches to the state of CVS as of 2007-12-01.

[privoxy.git] / debian / patches / 24_global_action.dpatch

diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch
index 916073f..4b90453 100755 (executable)
--- a/debian/patches/24_global_action.dpatch
+++ b/debian/patches/24_global_action.dpatch
@@ -21,18 +21,18 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
 diff -urNad privoxy~/config privoxy/config
 --- privoxy~/config
 +++ privoxy/config
-@@ -335,6 +335,7 @@
- #      without at least one actions file.
+@@ -361,6 +361,7 @@
+ #      to allow previously forbidden characters.
+ #
+ actionsfile standard.action  # Internal purpose, recommended
++actionsfile global.action    # Global default setting for all sites
+ actionsfile default.action   # Main actions file
+ actionsfile user.action      # User customizations
  #
- actionsfile standard  # Internal purpose, recommended
-+actionsfile global    # Global default setting for all sites
- actionsfile default   # Main actions file
- actionsfile user      # User customizations
- 
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -537,16 +537,6 @@
+@@ -552,16 +552,6 @@
  allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
  
  #############################################################################