[Pkg-mozext-commits] [adblock-plus] 20/22: Refresh patch

[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 da7e84f223c3d6e2a46e8e84f772803c1a931f2a
Author: David Prévot <taffit at debian.org>
Date:   Wed Jun 4 13:33:57 2014 -0400

    Refresh patch
    
    Git-Dch: Ignore
---
 .../0001-Disable-acceptable-ads-feature-by-default.patch     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 28adc24..5dbff84 100644
--- a/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
+++ b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
@@ -12,12 +12,12 @@ 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 a61a01c..752742d 100644
+index c4f367b..a0ac6da 100644
 --- a/chrome/content/ui/firstRun.html
 +++ b/chrome/content/ui/firstRun.html
-@@ -40,11 +40,6 @@
-     <section id="legacySafariWarning" class="i18n_firstRun_legacySafariWarning" hidden="true"></section>
-     <section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning" hidden="true"></section>
+@@ -41,11 +41,6 @@
+     <section id="filterlistsReinitializedWarning" class="i18n_firstRun_filterlistsReinitializedWarning warning" hidden="true"></section>
+     <section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning warning" hidden="true"></section>
  
 -    <section id="acceptable-ads">
 -      <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
@@ -28,10 +28,10 @@ index a61a01c..752742d 100644
      <section id="share">
        <h2 id="share-headline" class="i18n_firstRun_share_headline"></h2>
 diff --git a/lib/ui.js b/lib/ui.js
-index 161402a..2e11c19 100644
+index e61200a..932c078 100644
 --- a/lib/ui.js
 +++ b/lib/ui.js
-@@ -755,7 +755,7 @@ let UI = exports.UI =
+@@ -772,7 +772,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).

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