[Pkg-mozext-commits] [adblock-plus] 49/52: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Jan 22 21:43:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 05c2e90469dd4d6bc1914228b46fa096fdb39198
Author: David Prévot <taffit at debian.org>
Date: Thu Jan 22 17:01:38 2015 -0400
Refresh patches
Git-Dch: Ignore
---
...001-Disable-acceptable-ads-feature-by-default.patch | 18 +++++++++---------
debian/patches/0002-No-focus-on-new-tab.patch | 2 +-
2 files changed, 10 insertions(+), 10 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 17a5def..297a5d7 100644
--- a/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
+++ b/debian/patches/0001-Disable-acceptable-ads-feature-by-default.patch
@@ -7,15 +7,15 @@ 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 +-
+ adblockplusui/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 d2cf6c6..7237d2e 100644
---- a/chrome/content/ui/firstRun.html
-+++ b/chrome/content/ui/firstRun.html
-@@ -41,11 +41,6 @@
+diff --git a/adblockplusui/firstRun.html b/adblockplusui/firstRun.html
+index 116bbea..5147587 100644
+--- a/adblockplusui/firstRun.html
++++ b/adblockplusui/firstRun.html
+@@ -38,11 +38,6 @@
<section id="filterlistsReinitializedWarning" class="i18n_firstRun_filterlistsReinitializedWarning warning" hidden="true"></section>
<section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning warning" hidden="true"></section>
@@ -28,10 +28,10 @@ index d2cf6c6..7237d2e 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 748a003..014ed0a 100644
+index 7e15df8..b622f1c 100644
--- a/lib/ui.js
+++ b/lib/ui.js
-@@ -771,7 +771,7 @@ let UI = exports.UI =
+@@ -777,7 +777,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 b628f22..748e08a 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 cbc17ae..0b0da3e 100644
+index 992d568..741cd3f 100644
--- a/lib/appSupport.js
+++ b/lib/appSupport.js
@@ -271,7 +271,7 @@ switch (application)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list