X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F24_global_action.dpatch;h=b9e8ce7b031af3dd4f1cd6177c95d8b83cf0d688;hb=b96d9243b1252c7dc423957782894a99cd4448f4;hp=916073fe2bd765170e033d1b647e41023d73f9db;hpb=b0184cb983140a641d30ebfb4942759f48c010a9;p=privoxy.git diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch index 916073fe..b9e8ce7b 100755 --- a/debian/patches/24_global_action.dpatch +++ b/debian/patches/24_global_action.dpatch @@ -9,7 +9,7 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in --- privoxy~/GNUmakefile.in +++ privoxy/GNUmakefile.in -@@ -166,7 +166,7 @@ +@@ -167,7 +167,7 @@ ############################################################################# # We include these files in our distributions ############################################################################# @@ -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. +@@ -371,6 +371,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 @@ +@@ -550,16 +550,6 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} #############################################################################