--- browser/installer/package-manifest.orig.in 2017-03-24 21:09:39.027022000 +0100
+++ browser/installer/package-manifest.in 2017-03-24 23:07:21.881504771 +0100
@@ -74,9 +74,9 @@
#endif
#ifndef MOZ_SYSTEM_NSPR
#ifndef MOZ_FOLD_LIBS
-@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
-@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+#@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+#@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+#@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
#endif
#endif
#ifdef XP_MACOSX
@@ -622,9 +622,9 @@
@RESPATH@/chrome/recording.manifest
@RESPATH@/chrome/recording/*
#ifdef MOZ_GTK
-@RESPATH@/browser/chrome/icons/default/default16.png
-@RESPATH@/browser/chrome/icons/default/default32.png
-@RESPATH@/browser/chrome/icons/default/default48.png
+#@RESPATH@/browser/branding/official/default16.png
+#@RESPATH@/browser/branding/official/default32.png
+#@RESPATH@/browser/branding/official/default48.png
#endif
@RESPATH@/browser/features/*
@@ -642,7 +642,7 @@
#ifdef XP_UNIX
#ifndef XP_MACOSX
; shell icons
-@RESPATH@/browser/icons/*.png
+#@RESPATH@/browser/icons/*.png
#ifdef MOZ_UPDATER
; updater icon
@RESPATH@/icons/updater.png
--- browser/installer/allowed-dupes.orig.mn 2017-03-19 19:59:09.000000000 +0100
+++ browser/installer/allowed-dupes.mn 2017-03-24 23:15:37.026964374 +0100
@@ -110,6 +110,37 @@
browser/features/flyweb@mozilla.org/chrome/skin/windows/icon-64-anchored.png
browser/features/flyweb@mozilla.org/chrome/skin/windows/icon-64.png
browser/icons/mozicon128.png
+#
+browser/extensions/abouticecat@gnu.org/defaults/preferences/preferences.js
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/lib/settings/settings.js
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/node_modules/pathfinder/docs/addon-warning.md
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/node_modules/pathfinder/docs/content-policy.md
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/node_modules/pathfinder/test/test-userstyles.css
+browser/extensions/html5-video-everywhere@lejenome.me/bootstrap.js
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/bootstrap.js
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/data/assets/images/README
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/data/widget/images/README
+browser/chrome/browser/content/browser/aboutaccounts/images/fox.png
+browser/extensions/spyblock@gnu.org/chrome/content/ui/ext/common.js
+browser/extensions/spyblock@gnu.org/lib/ext_common.js
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/data/widget/images/librejs-64.png
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/icon.png
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/data/images/gnu-icon.png
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/node_modules/notification-box/data/gnu-icon.png
+browser/extensions/html5-video-everywhere@lejenome.me/LICENSE
+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-break/LICENSE
+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-dailymotion/LICENSE
+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-facebook/LICENSE
+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-metacafe/LICENSE
+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-vimeo/LICENSE
+browser/extensions/html5-video-everywhere@lejenome.me/node_modules/h5vew-site-youtube/LICENSE
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/data/licenses/mpl-2.0.txt
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/node_modules/notification-box/LICENSE
+browser/extensions/spyblock@gnu.org/chrome/content/ui/skin/abp-128.png
+browser/extensions/spyblock@gnu.org/chrome/skin/abp-icon-big.png
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/COPYING
+browser/extensions/jid1-KtlZuoiikVfFew@jetpack/data/licenses/gpl-3.0.txt
+#
chrome.manifest
chrome/en-US/locale/en-US/browser/overrides/AccessFu.properties
chrome/en-US/locale/en-US/browser/overrides/about.dtd