Issue 6892 - Update adblockplusui dependency to hg:7386698260f4

metadata.chrome

 [general]
 basename = adblockpluschrome
 version = 3.2
 author = eyeo GmbH
 backgroundScripts = polyfill.js
   ext/common.js
   ext/background.js
   lib/compat.js
   lib/publicSuffixList.js
   lib/adblockplus.js
@@ skipping 40 matching lines @@
 [contentScripts]
 document_start =
   polyfill.js
   ext/common.js
   ext/content.js
   include.preload.js
 document_end = include.postload.js
 
 [mapping]
 subscriptions.xml = adblockpluscore/chrome/content/ui/subscriptions.xml
-firstRun.html = adblockplusui/firstRun.html
+first-run.html = adblockplusui/first-run.html
 common.js = adblockplusui/common.js
-firstRun.js = adblockplusui/firstRun.js
+first-run.js = adblockplusui/first-run.js
 i18n.js = adblockplusui/i18n.js
 icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png
 skin/common.css = adblockplusui/skin/common.css
 skin/fonts.css = adblockplusui/skin/fonts.css
-skin/firstRun.css = adblockplusui/skin/firstRun.css
+skin/first-run.css = adblockplusui/skin/first-run.css
 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg
-skin/ajax-loader.gif = adblockplusui/skin/ajax-loader.gif
-skin/background.png = adblockplusui/skin/background.png
-skin/background-main.png = adblockplusui/skin/background-main.png
-skin/background-share.png = adblockplusui/skin/background-share.png
-skin/donate.png = adblockplusui/skin/donate.png
 skin/abb-logo.png = adblockplusui/skin/abb-logo.png
-skin/fonts/CreteRound-Italic.otf = adblockplusui/skin/fonts/CreteRound-Italic.otf
-skin/fonts/CreteRound-Regular.otf = adblockplusui/skin/fonts/CreteRound-Regular.otf
-skin/fonts/Source-Sans-Pro/LICENSE.txt = adblockplusui/skin/fonts/Source-Sans-Pro/LICENSE.txt
+LICENSE-3RD-PARTY.txt = adblockplusui/LICENSE-3RD-PARTY.txt

[Sebastian Noack, 2018/09/13 12:11:26]

We don't include our own COPYING file into the builds either.

[Thomas Greiner, 2018/09/13 15:13:35]

There's actually a ticket to change that (see #6765).

I guess in the end it's more of a question for Kai whether or not it should be
included in our extension bundles. We're just providing the license to the
extension here to play things safe as this seems to be a requirement for some of
those licenses.

[Sebastian Noack, 2018/09/13 15:30:29]

I commented on issue 6765. Anyway, as long as we don't even bundle out own
license with the builds, there is no point in bundling this file either.

[Thomas Greiner, 2018/09/13 16:00:31]

Makes sense, I've removed the import for now.
Done.

 skin/fonts/Source-Sans-Pro/300/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/cyrillic.woff2
 skin/fonts/Source-Sans-Pro/300/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/cyrillic-ext.woff2
 skin/fonts/Source-Sans-Pro/300/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/greek.woff2
 skin/fonts/Source-Sans-Pro/300/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/greek-ext.woff2
 skin/fonts/Source-Sans-Pro/300/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/latin.woff2
 skin/fonts/Source-Sans-Pro/300/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/latin-ext.woff2
 skin/fonts/Source-Sans-Pro/300/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/300/vietnamese.woff2
 skin/fonts/Source-Sans-Pro/400/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/cyrillic.woff2
 skin/fonts/Source-Sans-Pro/400/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/cyrillic-ext.woff2
 skin/fonts/Source-Sans-Pro/400/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/greek.woff2
 skin/fonts/Source-Sans-Pro/400/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/greek-ext.woff2
 skin/fonts/Source-Sans-Pro/400/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/latin.woff2
 skin/fonts/Source-Sans-Pro/400/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/latin-ext.woff2
 skin/fonts/Source-Sans-Pro/400/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/400/vietnamese.woff2
 skin/fonts/Source-Sans-Pro/700/cyrillic.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/cyrillic.woff2
 skin/fonts/Source-Sans-Pro/700/cyrillic-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/cyrillic-ext.woff2
 skin/fonts/Source-Sans-Pro/700/greek.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/greek.woff2
 skin/fonts/Source-Sans-Pro/700/greek-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/greek-ext.woff2
 skin/fonts/Source-Sans-Pro/700/latin.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/latin.woff2
 skin/fonts/Source-Sans-Pro/700/latin-ext.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/latin-ext.woff2
 skin/fonts/Source-Sans-Pro/700/vietnamese.woff2 = adblockplusui/skin/fonts/Source-Sans-Pro/700/vietnamese.woff2
 skin/icons/attention.svg = adblockplusui/skin/icons/attention.svg
-skin/icons/checkbox.png = adblockplusui/skin/icons/checkbox.png
 skin/icons/checkbox.svg = adblockplusui/skin/icons/checkbox.svg
 skin/icons/checkmark.svg = adblockplusui/skin/icons/checkmark.svg
 skin/icons/code.svg = adblockplusui/skin/icons/code.svg
 skin/icons/delete.svg = adblockplusui/skin/icons/delete.svg
 skin/icons/gear.svg = adblockplusui/skin/icons/gear.svg
 skin/icons/globe.svg = adblockplusui/skin/icons/globe.svg
 skin/icons/reload.svg = adblockplusui/skin/icons/reload.svg
 skin/icons/toggle.svg = adblockplusui/skin/icons/toggle.svg
 skin/icons/tooltip.svg = adblockplusui/skin/icons/tooltip.svg
 skin/icons/trash.svg = adblockplusui/skin/icons/trash.svg
-skin/social/facebook.png = adblockplusui/skin/social/facebook.png
 skin/social/facebook.svg = adblockplusui/skin/social/facebook.svg
-skin/social/googleplus.png = adblockplusui/skin/social/googleplus.png
 skin/social/googleplus.svg = adblockplusui/skin/social/googleplus.svg
-skin/social/renren.png = adblockplusui/skin/social/renren.png
-skin/social/twitter.png = adblockplusui/skin/social/twitter.png
 skin/social/twitter.svg = adblockplusui/skin/social/twitter.svg
-skin/social/weibo.png = adblockplusui/skin/social/weibo.png
-skin/updates/appstore-bg.svg = adblockplusui/skin/updates/appstore-bg.svg
+skin/backgrounds/appstore.svg = adblockplusui/skin/backgrounds/appstore.svg
 skin/updates/base-graphic.svg = adblockplusui/skin/updates/base-graphic.svg
-skin/updates/googleplay-bg.svg = adblockplusui/skin/updates/googleplay-bg.svg
+skin/backgrounds/googleplay.svg = adblockplusui/skin/backgrounds/googleplay.svg
 skin/updates/icon-mobile.svg = adblockplusui/skin/updates/icon-mobile.svg
 skin/updates/icon-rocket.svg = adblockplusui/skin/updates/icon-rocket.svg
 skin/updates/icon-thumbs-up.svg = adblockplusui/skin/updates/icon-thumbs-up.svg
 devtools-panel.html = adblockplusui/devtools-panel.html
 devtools-panel.js = adblockplusui/devtools-panel.js
 skin/devtools-panel.css = adblockplusui/skin/devtools-panel.css
 issue-reporter.html = adblockplusui/issue-reporter.html
 issue-reporter.js = adblockplusui/issue-reporter.js
 skin/issue-reporter.css = adblockplusui/skin/issue-reporter.css
 desktop-options.html = adblockplusui/desktop-options.html
 desktop-options.js = adblockplusui/desktop-options.js
 skin/desktop-options.css = adblockplusui/skin/desktop-options.css
 updates.html = adblockplusui/updates.html
 updates.js = adblockplusui/updates.js
 skin/updates.css = adblockplusui/skin/updates.css
 snippets.js = adblockpluscore/lib/content/snippets.js
+skin/icons/iconOff.svg = adblockplusui/skin/icons/iconOff.svg
+skin/icons/iconOn.svg = adblockplusui/skin/icons/iconOn.svg
+skin/icons/android.svg = adblockplusui/skin/icons/android.svg
+skin/icons/apple.svg = adblockplusui/skin/icons/apple.svg
+skin/icons/block-element.svg = adblockplusui/skin/icons/block-element.svg
+skin/icons/critical.svg = adblockplusui/skin/icons/critical.svg
+skin/icons/info.svg = adblockplusui/skin/icons/info.svg
+skin/icons/options.svg = adblockplusui/skin/icons/options.svg
+skin/icons/report-issue.svg = adblockplusui/skin/icons/report-issue.svg
+popup.js = adblockplusui/popup.js
+skin/popup.css = adblockplusui/skin/popup.css
+popup.html = adblockplusui/popup.html

[Sebastian Noack, 2018/09/13 12:11:26]

Since those files are no longer in adblockpluschrome, please update the source
paths on https://adblockplus.org/modules. (The patch can be "Noissue".)

[Thomas Greiner, 2018/09/13 15:13:35]

Will do. Thanks for the hint.

+skin/icons/radio.svg = adblockplusui/skin/icons/radio.svg
+skin/icons/highlight.svg = adblockplusui/skin/icons/highlight.svg
+skin/icons/hide.svg = adblockplusui/skin/icons/hide.svg
+skin/icons/first-run/checkmark-header.svg = adblockplusui/skin/icons/first-run/checkmark-header.svg
+skin/icons/first-run/checkmark.svg = adblockplusui/skin/icons/first-run/checkmark.svg
+skin/icons/first-run/lock.svg = adblockplusui/skin/icons/first-run/lock.svg
+skin/icons/first-run/rocket.svg = adblockplusui/skin/icons/first-run/rocket.svg
+skin/icons/web/navbar-logo.svg = adblockplusui/skin/icons/web/navbar-logo.svg
+skin/web.css = adblockplusui/skin/web.css
 
 [bundles]
 lib/adblockplus.js =
   adblockpluscore/lib/filterListener.js
   adblockpluscore/lib/synchronizer.js
   lib/devtools.js
   lib/requestBlocker.js
   lib/popupBlocker.js
   lib/subscriptionInit.js
   lib/filterComposer.js
   lib/stats.js
   lib/uninstall.js
   lib/csp.js
   lib/contentFiltering.js
   adblockplusui/messageResponder.js
 include.preload.js =
   include.preload.js
   inject.preload.js
 include.postload.js =
   subscriptionLink.postload.js
   composer.postload.js
 
 [import_locales]
 adblockplusui/locale/*/antiadblockInit.json = *
 adblockplusui/locale/*/common.json = *
+adblockplusui/locale/*/composer.json = *
 adblockplusui/locale/*/desktop-options.json = *
-adblockplusui/locale/*/firstRun.json = *
+adblockplusui/locale/*/filter-validation.json = *
+adblockplusui/locale/*/first-run.json = *
 adblockplusui/locale/*/issue-reporter.json = *
+adblockplusui/locale/*/manifest.json = *
+adblockplusui/locale/*/notification-helper.json = *
+adblockplusui/locale/*/popup.json = *
 adblockplusui/locale/*/updates.json = *