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

[David Prévot]

The following commit has been merged in the master branch:
commit 2ffe45baecbec09634491002ec2d4a437e588cc4
Author: David Prévot <taffit at debian.org>
Date:   Fri Jul 12 10:21:33 2013 -0400

    Also remove text at first run about acceptable ads
    
    Git-Dch: Ignore

diff --git a/debian/patches/disable_non-intrusive.patch b/debian/patches/disable_non-intrusive.patch
index 5ea9291..50a0566 100644
--- a/debian/patches/disable_non-intrusive.patch
+++ b/debian/patches/disable_non-intrusive.patch
@@ -1,9 +1,11 @@
 Description: Disable "acceptable ads" feature by default
- Upstream prefers to get them activated by default. 
+ Upstream prefers to get them activated by default.
+ The text shown at first run about the acceptable ads is also removed
+ since it’s not relevant anymore.
 Author: David Prévot <taffit at debian.org>
 Bug-Debian: http://bugs.debian.org/653112
 Forwarded: not-needed
-Last-Update: 2013-07-11
+Last-Update: 2013-07-12
 --- a/lib/ui.js
 +++ b/lib/ui.js
 @@ -716,7 +716,7 @@
@@ -15,3 +17,14 @@ Last-Update: 2013-07-11
      let privacySubscriptions = {
        "https://easylist-downloads.adblockplus.org/easyprivacy+easylist.txt": true,
        "https://easylist-downloads.adblockplus.org/easyprivacy.txt": true,
+--- a/chrome/content/ui/firstRun.html
++++ b/chrome/content/ui/firstRun.html
+@@ -34,8 +34,6 @@
+ 
+       <p id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning" hidden="true"></p>
+ 
+-      <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
+-
+       <h2 id="features-title" class="i18n_firstRun_features"></h2>
+ 
+       <ul id="features">

-- 
Advertisement filter extension for the Iceweasel/Iceape