[Pkg-mozext-commits] [adblock-plus] 03/07: Refresh patches

[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 7083cbac87611831bf60ca7440b19d2089296ae9
Author: David Prévot <taffit at debian.org>
Date:   Fri Jan 17 10:06:29 2014 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 .../0001-Disable-acceptable-ads-feature-by-default.patch | 16 ++++++++--------
 debian/patches/0002-No-focus-on-new-tab.patch            |  6 +++---
 2 files changed, 11 insertions(+), 11 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
index 19f6e4a..ad4d31d 100644
--- a/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
+++ b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
@@ -1,4 +1,4 @@
-From: David Prévot <taffit at debian.org>
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
 Date: Wed, 9 Oct 2013 23:58:33 -0400
 Subject: Disable "acceptable ads" feature by default
 
@@ -12,26 +12,26 @@ Forwarded: not-needed
  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
+index 0bd5285..274d3ac 100644
 --- a/chrome/content/ui/firstRun.html
 +++ b/chrome/content/ui/firstRun.html
-@@ -36,11 +36,6 @@
+@@ -40,11 +40,6 @@
+     <section id="legacySafariWarning" class="i18n_firstRun_legacySafariWarning" hidden="true"></section>
      <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>
  
+     <section id="share">
+       <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
 diff --git a/lib/ui.js b/lib/ui.js
-index 5777d2a..1aa1a0e 100644
+index 4a46590..dc603ee 100644
 --- a/lib/ui.js
 +++ b/lib/ui.js
-@@ -728,7 +728,7 @@ let UI = exports.UI =
+@@ -730,7 +730,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).
diff --git a/debian/patches/0002-No-focus-on-new-tab.patch b/debian/patches/0002-No-focus-on-new-tab.patch
index ed0e7db..71351fe 100644
--- a/debian/patches/0002-No-focus-on-new-tab.patch
+++ b/debian/patches/0002-No-focus-on-new-tab.patch
@@ -1,4 +1,4 @@
-From: David Prévot <taffit at debian.org>
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
 Date: Wed, 9 Oct 2013 23:58:33 -0400
 Subject: No focus on new tab
 
@@ -12,10 +12,10 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/appSupport.js b/lib/appSupport.js
-index 3ca6ce3..b73c2d9 100644
+index e0dd46a..eaeb463 100644
 --- a/lib/appSupport.js
 +++ b/lib/appSupport.js
-@@ -271,7 +271,7 @@ switch (application)
+@@ -270,7 +270,7 @@ switch (application)
        if (event)
          window.openNewTabWith(url, exports.getBrowser(window).contentDocument, null, event, false);
        else

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