From 15370ff5b453665b031642cc3214fab2ce50ec81 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Thu, 29 Jun 2006 17:08:58 +0000 Subject: [PATCH] Bug 343126 - Spell checker broken (part 2, packaging errors), r=enndeakin --- browser/installer/removed-files.in | 2 ++ browser/installer/unix/packages-static | 3 +-- browser/installer/windows/packages-static | 3 +-- mail/config/basemail-unix | 4 +--- mail/installer/removed-files.in | 2 ++ mail/installer/windows/packages-static | 3 +-- xpinstall/packager/packages-os2 | 2 +- xpinstall/packager/packages-unix | 2 +- xpinstall/packager/packages-win | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 2ffe4bb6acd..d12caed149f 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -68,3 +68,5 @@ extensions/inspector@mozilla.org/components/inspector.xpt extensions/inspector@mozilla.org/components/@DLL_PREFIX@inspector@DLL_SUFFIX@ uninstall/UninstallFirefox.exe uninstall/UninstallDeerPark.exe +components/myspell/en-US.dic +components/myspell/en-US.aff diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static index 5d109e253c3..26d648babf4 100644 --- a/browser/installer/unix/packages-static +++ b/browser/installer/unix/packages-static @@ -26,6 +26,7 @@ bin/defaults/profile/search.rdf bin/defaults/profile/mimeTypes.rdf bin/defaults/profile/chrome/* bin/updater.ini +bin/dictionaries/* [xpcom] bin/libmozjs.so @@ -304,8 +305,6 @@ bin/components/dom_svg.xpt bin/components/libmyspell.so bin/components/spellchecker.xpt bin/components/libspellchecker.so -;; XXX these two files are bogus, they should not be in components/myspell... -bin/components/myspell/* ; [Personal Security Manager] ; diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static index 6cf288b2b2e..642ecd0b63f 100644 --- a/browser/installer/windows/packages-static +++ b/browser/installer/windows/packages-static @@ -25,6 +25,7 @@ bin\defaults\profile\search.rdf bin\defaults\profile\mimeTypes.rdf bin\defaults\profile\chrome\* bin\updater.ini +bin\dictionaries\* [xpcom] bin\js3250.dll @@ -302,8 +303,6 @@ bin\components\dom_svg.xpt bin\components\myspell.dll bin\components\spellchecker.xpt bin\components\spellchk.dll -;; XXX these two files are bogus, they should not be in components\myspell... -bin\components\myspell\* ; [Personal Security Manager] ; diff --git a/mail/config/basemail-unix b/mail/config/basemail-unix index 620d3715574..c0178d2bdbb 100644 --- a/mail/config/basemail-unix +++ b/mail/config/basemail-unix @@ -50,7 +50,7 @@ chrome/en-US-mail.jar ;;a static installed-chrome.txt chrome/en-unix.jar ;;chrome/en-unix.jar - +dictionaries/* ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Default Profile Settings @@ -99,8 +99,6 @@ components/downloads.xpt components/libmyspell.so components/spellchecker.xpt components/libspellchecker.so -;; XXX these two files are bogus, they should not be in components/myspell... -components/myspell/* ; xpinstall (needed to dynamically install themes components/libxpinstall.so diff --git a/mail/installer/removed-files.in b/mail/installer/removed-files.in index 5a23ff59880..63bf8baf774 100644 --- a/mail/installer/removed-files.in +++ b/mail/installer/removed-files.in @@ -200,3 +200,5 @@ mozABConduit.dll components/palmsync.dll components/palmSync.xpt uninstall/UninstallThunderbird.exe +components/myspell/en-US.dic +components/myspell/en-US.aff diff --git a/mail/installer/windows/packages-static b/mail/installer/windows/packages-static index ba866c68273..6900d868c7f 100644 --- a/mail/installer/windows/packages-static +++ b/mail/installer/windows/packages-static @@ -8,6 +8,7 @@ bin\chrome\@AB_CD@.jar bin\chrome\@AB_CD@.manifest bin\chrome\mail-locales.manifest +bin\dictionaries\* [xpcom] bin\xpcom.dll @@ -158,8 +159,6 @@ bin\components\downloads.xpt bin\components\myspell.dll bin\components\spellchecker.xpt bin\components\spellchk.dll -;; XXX these two files are bogus, they should not be in components\myspell... -bin\components\myspell\* ; xpinstall (needed to dynamically install themes bin\components\xpinstall.xpt diff --git a/xpinstall/packager/packages-os2 b/xpinstall/packager/packages-os2 index d9fa6e01c4b..0b5e2ee70fa 100644 --- a/xpinstall/packager/packages-os2 +++ b/xpinstall/packager/packages-os2 @@ -479,7 +479,7 @@ bin/res/inspector/search-registry.rdf bin/components/myspell.dll bin/components/spellchk.dll bin/components/spellchecker.xpt -bin/components/myspell/* +bin/dictionaries/* [reporter] bin/chrome/reporter.jar diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index 7c2a1b8aa0f..819fac3ef9c 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -536,7 +536,7 @@ bin/chrome/icons/default/winInspectorMain*.xpm bin/components/libmyspell.so bin/components/libspellchecker.so bin/components/spellchecker.xpt -bin/components/myspell/* +bin/dictionaries/* [reporter] bin/chrome/reporter.jar diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win index ce8382ab04b..b0bba6d8c34 100644 --- a/xpinstall/packager/packages-win +++ b/xpinstall/packager/packages-win @@ -376,7 +376,7 @@ bin\chrome\sroaming.jar bin\components\myspell.dll bin\components\spellchk.dll bin\components\spellchecker.xpt -bin\components\myspell\* +bin\dictionaries\* [reporter] bin\chrome\reporter.jar