[Pkg-mozext-commits] [adblock-plus] 83/87: 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 6eabda30a10c6fe046ac63b24b29f2656f917e8b
Author: David Prévot <taffit at debian.org>
Date:   Sat Apr 30 13:28:07 2016 -0400

    Refresh patches
    
    Git-Dch: Ignore
---
 .../0001-Disable-acceptable-ads-feature-by-default.patch     | 12 ++++++------
 debian/patches/0004-Drop-dependency-check.patch              | 12 ++++++------
 2 files changed, 12 insertions(+), 12 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 0a413c3..e989acc 100644
--- a/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
+++ b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
@@ -12,25 +12,25 @@ Forwarded: not-needed
  2 files changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/adblockplusui/firstRun.html b/adblockplusui/firstRun.html
-index e6f305e..40174b6 100644
+index 16e8c85..d66a4bd 100644
 --- a/adblockplusui/firstRun.html
 +++ b/adblockplusui/firstRun.html
-@@ -43,10 +43,6 @@
+@@ -42,10 +42,6 @@
  
      <div id="content">
        <section id="general">
--        <div id="acceptable-ads-block">
+-        <div id="acceptable-ads-block" class="block">
 -          <h2 class="i18n_firstRun_acceptableAdsHeadline"></h2>
 -          <p id="acceptable-ads-explanation" class="i18n_firstRun_acceptableAdsExplanation"></p>
 -        </div>
-         <div id="abb-promotion-block">
+         <div id="abb-promotion-block" class="block">
            <h2 class="i18n_firstRun_abbPromotionHeadline"></h2>
            <a href="https://adblockbrowser.org/?ref=frp">
 diff --git a/lib/ui.js b/lib/ui.js
-index ab97cdd..e5f308a 100644
+index 6240969..e355f42 100644
 --- a/lib/ui.js
 +++ b/lib/ui.js
-@@ -820,7 +820,7 @@ let UI = exports.UI =
+@@ -808,7 +808,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/0004-Drop-dependency-check.patch b/debian/patches/0004-Drop-dependency-check.patch
index 02a8aa4..a4ba40f 100644
--- a/debian/patches/0004-Drop-dependency-check.patch
+++ b/debian/patches/0004-Drop-dependency-check.patch
@@ -11,20 +11,20 @@ Forwarded: not-needed
  1 file changed, 7 deletions(-)
 
 diff --git a/build.py b/build.py
-index cca908e..5ab3a92 100755
+index 8501ed1..2d2419d 100755
 --- a/build.py
 +++ b/build.py
-@@ -4,13 +4,6 @@
- import os, sys, subprocess
+@@ -6,13 +6,6 @@ import sys
+ import subprocess
  
  BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 -DEPENDENCY_SCRIPT = os.path.join(BASE_DIR, "ensure_dependencies.py")
 -
 -try:
--  subprocess.check_call([sys.executable, DEPENDENCY_SCRIPT, BASE_DIR])
+-    subprocess.check_call([sys.executable, DEPENDENCY_SCRIPT, BASE_DIR])
 -except subprocess.CalledProcessError as e:
--  print >>sys.stderr, e
--  print >>sys.stderr, "Failed to ensure dependencies being up-to-date!"
+-    print >>sys.stderr, e
+-    print >>sys.stderr, "Failed to ensure dependencies being up-to-date!"
  
  import buildtools.build
  buildtools.build.processArgs(BASE_DIR, sys.argv)

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