diff options
| author | JustOff <Off.Just.Off@gmail.com> | 2018-04-14 19:18:40 +0300 |
|---|---|---|
| committer | JustOff <Off.Just.Off@gmail.com> | 2018-04-14 19:18:40 +0300 |
| commit | 01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125 (patch) | |
| tree | 69438df6a5406510ead01d5406872a9ca0ee1122 /application/palemoon/installer/removed-files.in | |
| parent | 25370b7f0cc8709821acc8b7826c2c6e38268c67 (diff) | |
| parent | 64204fdb8302c8bf483d724430dd83f43c1cb6ff (diff) | |
| download | UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.gz UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.lz UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.xz UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP and resolve conflicts
Diffstat (limited to 'application/palemoon/installer/removed-files.in')
| -rw-r--r-- | application/palemoon/installer/removed-files.in | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/application/palemoon/installer/removed-files.in b/application/palemoon/installer/removed-files.in index 8bfd72e4e..8801d1cb0 100644 --- a/application/palemoon/installer/removed-files.in +++ b/application/palemoon/installer/removed-files.in @@ -65,29 +65,27 @@ # platforms. # Common File Removals +# This is located under the "distribution/" directory and it was added before +# Firefox 27 +@DIR_MACOS@distribution/extensions/testpilot@labs.mozilla.com.xpi -# Some users are ending up with unpacked chrome instead of omni.ja. This -# causes updates to break badly, see bug 1063052. Removing the toplevel -# chrome.manifest causes us to use the updated omni.ja. -#ifndef MOZ_GTK - @DIR_MACOS@chrome.manifest - #ifdef XP_MACOSX - @DIR_RESOURCES@chrome.manifest - #endif +# Mac OS X v2 signing removals +#ifdef XP_MACOSX + @DIR_MACOS@active-update.xml + @DIR_MACOS@update-settings.ini + @DIR_MACOS@updates.xml + @DIR_MACOS@defaults/* + @DIR_MACOS@updates/* #endif # Common Directory removals +@DIR_MACOS@chrome/ #ifdef XP_UNIX #ifndef XP_MACOSX chrome/icons/ chrome/icons/default/ #endif #endif - -# Remove previously-bundled ruby/s4e extensions -@DIR_MACOS@distribution/bundles/statusbar@palemoon.org/* -@DIR_MACOS@distribution/bundles/{3ff46564-d77c-491c-bfc5-fc555c87dbc4}/* - @DIR_MACOS@chrome/overlayinfo/ @DIR_MACOS@components/ @DIR_MACOS@defaults/autoconfig/ @@ -114,4 +112,5 @@ @DIR_MACOS@plugins/MRJPlugin.plugin/* Contents/Plug-Ins/PrintPDE.plugin/* #endif +@DIR_MACOS@searchplugins/* @DIR_MACOS@webapprt/components/ |