[Pkg-mozext-commits] [SCM] mozilla noscript extension branch, master, updated. debian/2.6.5.9-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 0d0c85823ecb39fd7bdd1a93f9c93cee35868172
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Mar 15 19:03:13 2013 +0000

    Refresh Debian patches

diff --git a/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch b/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
index b26701a..e921f36 100644
--- a/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
+++ b/debian/patches/0001-do-not-redirect-on-upstream-author-page-after-upgrad.patch
@@ -1,15 +1,16 @@
-From 2bdc9cbe6990e4dac84c8e19cbaab09f3e799711 Mon Sep 17 00:00:00 2001
 From: arno <arenevier at fdn.fr>
 Date: Tue, 25 Aug 2009 23:31:39 +0200
-Subject: [PATCH 1/2] do not redirect on upstream author page after upgrade
+Subject: do not redirect on upstream author page after upgrade
 
 ---
  defaults/preferences/noscript.js |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/defaults/preferences/noscript.js b/defaults/preferences/noscript.js
+index 189700f..8f24450 100644
 --- a/defaults/preferences/noscript.js
 +++ b/defaults/preferences/noscript.js
-@@ -95,7 +95,7 @@ pref("noscript.forbidMetaRefresh.excepti
+@@ -96,7 +96,7 @@ pref("noscript.forbidMetaRefresh.exceptions", "^https?://(?:www|encrypted)\\.goo
  pref("noscript.contentBlocker", false);
  
  pref("noscript.toggle.temp", true);
diff --git a/debian/patches/0002-remove-websites-from-default-white-list.patch b/debian/patches/0002-remove-websites-from-default-white-list.patch
index c1952b5..fb2ae7e 100644
--- a/debian/patches/0002-remove-websites-from-default-white-list.patch
+++ b/debian/patches/0002-remove-websites-from-default-white-list.patch
@@ -1,24 +1,25 @@
-From 9ec177dd7907437bdf4af6510e8f51c36b19f6da Mon Sep 17 00:00:00 2001
 From: arno <arenevier at fdn.fr>
 Date: Tue, 25 Aug 2009 23:32:30 +0200
-Subject: [PATCH 2/2] remove websites from default white list
+Subject: remove websites from default white list
 
 ---
  defaults/preferences/noscript.js |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/defaults/preferences/noscript.js b/defaults/preferences/noscript.js
+index 8f24450..0485ffb 100644
 --- a/defaults/preferences/noscript.js
 +++ b/defaults/preferences/noscript.js
-@@ -29,7 +29,7 @@ pref("noscript.showExternalFilters", tru
+@@ -30,7 +30,7 @@ pref("noscript.showExternalFilters", true);
  pref("noscript.showTempAllowPage", true);
  pref("noscript.showAllowPage", true);
  pref("noscript.mandatory", "chrome: blob: about: about:addons about:blocked about:crashes about:home about:config about:neterror about:certerror about:memory about:plugins about:privatebrowsing about:sessionrestore about:support resource:");
--pref("noscript.default", "about:blank addons.mozilla.org persona.org mozilla.net flashgot.net google.com gstatic.com googleapis.com paypal.com paypalobjects.com securecode.com securesuite.net firstdata.com firstdata.lv informaction.com yahoo.com yimg.com yahooapis.com youtube.com ytimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com afx.ms gfx.ms wlxrs.com");
+-pref("noscript.default", "about:blank addons.mozilla.org persona.org mozilla.net flashgot.net google.com gstatic.com googleapis.com paypal.com paypalobjects.com securecode.com securesuite.net firstdata.com firstdata.lv informaction.com yahoo.com yimg.com yahooapis.com youtube.com ytimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com afx.ms gfx.ms sfx.ms wlxrs.com");
 +pref("noscript.default", "about:blank");
  
  pref("noscript.eraseFloatingElements", true);
  
-@@ -370,4 +370,4 @@ pref("noscript.ABE.rulesets.SYSTEM", "#
+@@ -376,4 +376,4 @@ pref("noscript.ABE.rulesets.SYSTEM", "# Prevent Internet sites from requesting L
  pref("noscript.ABE.rulesets.USER", "# User-defined rules. Feel free to experiment here.\r\n");
  pref("noscript.ABE.migration", 0);
  

-- 
mozilla noscript extension