[Pkg-mozext-commits] [adblock-plus] 93/98: 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 22b338286cc38bb687ebb1877d835fa8543468da
Author: David Prévot <david at tilapin.org>
Date:   Sun Oct 22 18:20:38 2017 -1000

    Refresh patches
    
    Git-Dch: Ignore
---
 ...001-Disable-acceptable-ads-feature-by-default.patch |  8 ++++----
 debian/patches/0002-No-focus-on-new-tab.patch          |  2 +-
 ...0003-Add-a-symlink-to-workaround-split-source.patch | 18 ------------------
 debian/patches/series                                  |  1 -
 4 files changed, 5 insertions(+), 24 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 e989acc..b7ee486 100644
--- a/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
+++ b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
@@ -12,10 +12,10 @@ Forwarded: not-needed
  2 files changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/adblockplusui/firstRun.html b/adblockplusui/firstRun.html
-index 16e8c85..d66a4bd 100644
+index 958c4f6..0520a5f 100644
 --- a/adblockplusui/firstRun.html
 +++ b/adblockplusui/firstRun.html
-@@ -42,10 +42,6 @@
+@@ -41,10 +41,6 @@
  
      <div id="content">
        <section id="general">
@@ -27,10 +27,10 @@ index 16e8c85..d66a4bd 100644
            <h2 class="i18n_firstRun_abbPromotionHeadline"></h2>
            <a href="https://adblockbrowser.org/?ref=frp">
 diff --git a/lib/ui.js b/lib/ui.js
-index 6240969..e355f42 100644
+index d5c2a36..94dcafa 100644
 --- a/lib/ui.js
 +++ b/lib/ui.js
-@@ -808,7 +808,7 @@ let UI = exports.UI =
+@@ -804,7 +804,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 69c0a86..8b9a08a 100644
--- a/debian/patches/0002-No-focus-on-new-tab.patch
+++ b/debian/patches/0002-No-focus-on-new-tab.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/appSupport.js b/lib/appSupport.js
-index 8752b43..45512e2 100644
+index ba8fdd1..cbfae93 100644
 --- a/lib/appSupport.js
 +++ b/lib/appSupport.js
 @@ -229,7 +229,7 @@ switch (application)
diff --git a/debian/patches/0003-Add-a-symlink-to-workaround-split-source.patch b/debian/patches/0003-Add-a-symlink-to-workaround-split-source.patch
deleted file mode 100644
index cd310e3..0000000
--- a/debian/patches/0003-Add-a-symlink-to-workaround-split-source.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Tue, 22 Jul 2014 15:09:59 -0400
-Subject: Add a symlink to workaround split source
-
-Bug: https://issues.adblockplus.org/ticket/170
----
- buildtools/jshydra | 1 +
- 1 file changed, 1 insertion(+)
- create mode 120000 buildtools/jshydra
-
-diff --git a/buildtools/jshydra b/buildtools/jshydra
-new file mode 120000
-index 0000000..0ce1332
---- /dev/null
-+++ b/buildtools/jshydra
-@@ -0,0 +1 @@
-+../jshydra
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 3b3d903..e3f4119 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Disable-acceptable-ads-feature-by-default.patch
 0002-No-focus-on-new-tab.patch
-0003-Add-a-symlink-to-workaround-split-source.patch
 0004-Drop-dependency-check.patch

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