[Pkg-mozext-commits] [SCM] Advertisement filter extension for the Iceweasel/Iceape branch, master, updated. debian/2.3-1-1-gd7ba12b

[David Prévot]

The following commit has been merged in the master branch:
commit d7ba12b83c95b87504869ecf7ab66207167fb9df
Author: David Prévot <taffit at debian.org>
Date:   Thu Jul 11 21:03:57 2013 -0400

    Disable "acceptable ads" feature by default
    
    Closes: #653112

diff --git a/debian/patches/disable_non-intrusive.patch b/debian/patches/disable_non-intrusive.patch
new file mode 100644
index 0000000..5ea9291
--- /dev/null
+++ b/debian/patches/disable_non-intrusive.patch
@@ -0,0 +1,17 @@
+Description: Disable "acceptable ads" feature by default
+ Upstream prefers to get them activated by default. 
+Author: David Prévot <taffit at debian.org>
+Bug-Debian: http://bugs.debian.org/653112
+Forwarded: not-needed
+Last-Update: 2013-07-11
+--- a/lib/ui.js
++++ b/lib/ui.js
+@@ -716,7 +716,7 @@
+   {
+     // Add "acceptable ads" subscription for new users and user updating from old ABP versions.
+     // Don't add it for users of privacy subscriptions (use a hardcoded list for now).
+-    let addAcceptable = (Services.vc.compare(prevVersion, "2.0") < 0);
++    let addAcceptable = false;
+     let privacySubscriptions = {
+       "https://easylist-downloads.adblockplus.org/easyprivacy+easylist.txt": true,
+       "https://easylist-downloads.adblockplus.org/easyprivacy.txt": true,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2c80f27
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_non-intrusive.patch

-- 
Advertisement filter extension for the Iceweasel/Iceape