[Pkg-mozext-commits] [adblock-plus] 03/09: Refresh patches (now handled via gbp pq)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 501f36d245125bb891aad558efc8d682e8a6dc49
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 10 00:11:05 2013 -0400

    Refresh patches (now handled via gbp pq)
---
 ...Disable-acceptable-ads-feature-by-default.patch |   42 ++++++++++++++++++++
 ...ew_tab.patch => 0002-No-focus-on-new-tab.patch} |   20 +++++++---
 debian/patches/disable_non-intrusive.patch         |   30 --------------
 debian/patches/series                              |    4 +-
 4 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
new file mode 100644
index 0000000..19f6e4a
--- /dev/null
+++ b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
@@ -0,0 +1,42 @@
+From: David Prévot <taffit at debian.org>
+Date: Wed, 9 Oct 2013 23:58:33 -0400
+Subject: Disable "acceptable ads" feature by default
+
+Upstream prefers to get them activated by default.
+
+Bug-Debian: http://bugs.debian.org/653112
+Forwarded: not-needed
+---
+ chrome/content/ui/firstRun.html | 5 -----
+ lib/ui.js                       | 2 +-
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/chrome/content/ui/firstRun.html b/chrome/content/ui/firstRun.html
+index dffa575..5687cb6 100644
+--- a/chrome/content/ui/firstRun.html
++++ b/chrome/content/ui/firstRun.html
+@@ -36,11 +36,6 @@
+     <section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning" hidden="true"></section>
+ 
+ 
+-    <section id="acceptable-ads">
+-      <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
+-      <p id="acceptableAdsExplanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
+-    </section>
+-
+     <section id="can-do-more">
+       <h2 class="i18n_firstRun_features"></h2>
+ 
+diff --git a/lib/ui.js b/lib/ui.js
+index 5777d2a..1aa1a0e 100644
+--- a/lib/ui.js
++++ b/lib/ui.js
+@@ -728,7 +728,7 @@ let UI = exports.UI =
+   {
+     // 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/no_focus_on_new_tab.patch b/debian/patches/0002-No-focus-on-new-tab.patch
similarity index 52%
rename from debian/patches/no_focus_on_new_tab.patch
rename to debian/patches/0002-No-focus-on-new-tab.patch
index da27ec3..ed0e7db 100644
--- a/debian/patches/no_focus_on_new_tab.patch
+++ b/debian/patches/0002-No-focus-on-new-tab.patch
@@ -1,13 +1,21 @@
-Description: No focus on new tab
- On first start of iceweasel, the new tab presenting Adblock Plus now
- stays on background.
-Author: David Prévot <David Prévot>
+From: David Prévot <taffit at debian.org>
+Date: Wed, 9 Oct 2013 23:58:33 -0400
+Subject: No focus on new tab
+
+On first start of iceweasel, the new tab presenting Adblock Plus now
+stays on background.
+
 Bug-Debian: http://bugs.debian.org/693160
 Forwarded: not-needed
-Last-Update: 2013-09-08
+---
+ lib/appSupport.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/appSupport.js b/lib/appSupport.js
+index 3ca6ce3..b73c2d9 100644
 --- a/lib/appSupport.js
 +++ b/lib/appSupport.js
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ switch (application)
        if (event)
          window.openNewTabWith(url, exports.getBrowser(window).contentDocument, null, event, false);
        else
diff --git a/debian/patches/disable_non-intrusive.patch b/debian/patches/disable_non-intrusive.patch
deleted file mode 100644
index 7faefd8..0000000
--- a/debian/patches/disable_non-intrusive.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Disable "acceptable ads" feature 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-09-08
---- a/lib/ui.js
-+++ b/lib/ui.js
-@@ -728,7 +728,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,
---- 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">
diff --git a/debian/patches/series b/debian/patches/series
index b66b900..335425d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-disable_non-intrusive.patch
-no_focus_on_new_tab.patch
+0001-Disable-acceptable-ads-feature-by-default.patch
+0002-No-focus-on-new-tab.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git