Bug 343126 - Spell checker broken (part 2, packaging errors), r=enndeakin

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

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]
 ;

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]
 ;

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

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

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

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

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

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