Bug 1345838 - Port bug 1315309 to c-c [Preprocess find-dupes exception list]. r=clokep, frg, jorgk a=me
authorRichard Marti <richard.marti@gmail.com>
Fri, 10 Mar 2017 07:33:34 +0100
changeset 28722 245528202a53a82b14d1a17fa5458d23d6cc6c07
parent 28721 ff228788b7eb8d2fea17fc3f282518dda8bd591d
child 28723 a10e7c19d7f373693e2a193204f17b4de3f7f741
push id372
push userclokep@gmail.com
push dateWed, 02 Aug 2017 13:08:11 +0000
reviewersclokep, frg, jorgk, me
bugs1345838, 1315309
Bug 1345838 - Port bug 1315309 to c-c [Preprocess find-dupes exception list]. r=clokep, frg, jorgk a=me
im/installer/allowed-dupes.mn
mail/installer/allowed-dupes.mn
suite/installer/allowed-dupes.mn
--- a/im/installer/allowed-dupes.mn
+++ b/im/installer/allowed-dupes.mn
@@ -11,10 +11,10 @@ chrome/instantbird/skin/classic/instantb
 chrome/instantbird/skin/classic/instantbird/messages/simple/Incoming/NextContext.html
 chrome/chat/content/chat/conv.html
 chrome/icons/default/default16.png
 icons/default16.png
 
 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn
 # and mail/installer/allowed-dupes.mn:
 # bug 658850
-instantbird
-instantbird-bin
+@MOZ_APP_NAME@
+@MOZ_APP_NAME@-bin
--- a/mail/installer/allowed-dupes.mn
+++ b/mail/installer/allowed-dupes.mn
@@ -30,18 +30,18 @@ extensions/{e2fda1a4-762b-4020-b5ad-a41d
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/windows/calendar/calendar-management.css
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calFilter.js
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
 extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/calUtils.js
 
 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn:
 # bug 658850
-thunderbird
-thunderbird-bin
+@MOZ_APP_NAME@
+@MOZ_APP_NAME@-bin
 # devtools reduction is bug 1311178
 chrome/devtools/content/dom/content/dom-view.css
 chrome/devtools/content/dom/dom.html
 chrome/devtools/content/dom/main.js
 chrome/devtools/content/framework/toolbox-options.js
 chrome/devtools/content/inspector/fonts/fonts.js
 chrome/devtools/content/inspector/inspector.xhtml
 chrome/devtools/content/memory/initializer.js
--- a/suite/installer/allowed-dupes.mn
+++ b/suite/installer/allowed-dupes.mn
@@ -364,18 +364,18 @@ distribution/extensions/inspector@mozill
 
 # Linux
 chrome/icons/default/default16.png
 chrome/icons/default/main-window16.png
 chrome/icons/default/default.png
 chrome/icons/default/main-window.png
 chrome/icons/default/default48.png
 chrome/icons/default/main-window48.png
-seamonkey
-seamonkey-bin
+@MOZ_APP_NAME@
+@MOZ_APP_NAME@-bin
 
 # OSX
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/sidebar/sbpicker-arrow.gif
 chrome/toolkit/skin/classic/global/arrow/arrow-dn-sharp.gif
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/arrow/arrow-lft-sharp.gif
 chrome/toolkit/skin/classic/global/arrow/arrow-lft-sharp.gif
 extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/global/arrow/arrow-rit-sharp.gif
 chrome/toolkit/skin/classic/global/arrow/arrow-rit-sharp.gif