X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpatches%2F24_global_action.dpatch;h=4b90453a7ac0d6b4952bad27f9d30577e749720f;hp=916073fe2bd765170e033d1b647e41023d73f9db;hb=60b84734caeb5cc110a3d0ec27351f33f5044dc0;hpb=b0184cb983140a641d30ebfb4942759f48c010a9 diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch index 916073fe..4b90453a 100755 --- 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} #############################################################################