X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F05_defaut_action.dpatch;h=87e731b76cd6574ef0a522058c05220e6fbf5582;hb=6dd911d7de3d68ed50c2b95081ac2f09d076ab14;hp=f1d9c9733ba1c04bf5424183ee99ff3f13fdabf1;hpb=6aa60a252059f209c5f3fb14502ad1deff7aba61;p=privoxy.git

diff --git a/debian/patches/05_defaut_action.dpatch b/debian/patches/05_defaut_action.dpatch
index f1d9c973..87e731b7 100644
--- a/debian/patches/05_defaut_action.dpatch
+++ b/debian/patches/05_defaut_action.dpatch
@@ -5,11 +5,21 @@
 ## DP: Serveral changes/additons to default.action.
 
 @DPATCH@
-diff -urNad privoxy~/default.action.master privoxy/default.action.master
+diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -1839,6 +1839,11 @@
- {+filter{tiny-textforms} +prevent-compression}
+@@ -2259,6 +2259,9 @@
+ #MASTER# REMARKS: Exclude per Debian bug report #377843
+ # URL = http://blogs.msdn.com/wga/archive/2006/07/16/667063.aspx
+ blogs.msdn.com
++#MASTER# REMARKS: Exclude per Debian bug report #441256
++#MASTER# PROBLEM-URL: http://www.memo.de/
++www.memo.de
+ 
+ {-filter{unsolicited-popups}}
+ # Sticky Actions = -filter{unsolicited-popups}
+@@ -2312,6 +2315,11 @@
+ {+filter{tiny-textforms}}
  .sourceforge.net/tracker
  
 +{-filter{ie-exploits}}