From 0b174e28abf93a5a1cf89e3cf4a0c20e07ef87a0 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Tue, 6 Jun 2000 06:28:19 +0000 Subject: [PATCH] fix for #14645. make migration work even if the user doesn't install mail-news. to avoid future errors, use a wild card to package all the default pref files with the browser package. r=alecf --- xpinstall/packager/packages-mac | 10 +++------- xpinstall/packager/packages-unix | 11 +++-------- xpinstall/packager/packages-win | 11 +++-------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac index 8b0cf692b080..4eb008f0849e 100644 --- a/xpinstall/packager/packages-mac +++ b/xpinstall/packager/packages-mac @@ -171,12 +171,9 @@ viewer:chrome:skins:* -viewer:chrome:packages:core:editor:content:sb-FileWidgetFileHandler.js -viewer:chrome:packages:core:communicator:content:domviewer -viewer:defaults:pref:all.js -viewer:defaults:pref:config.js -viewer:defaults:Pref:editor.js -viewer:defaults:pref:initpref.js -viewer:defaults:pref:macprefs.js -viewer:defaults:pref:xpinstall.js +; all the pref files must be part of base +; to prevent migration bugs +viewer:defaults:pref:* viewer:defaults:profile:* viewer:res:arrow.gif viewer:res:charsetalias.properties @@ -233,7 +230,6 @@ viewer:res:ua.css [mail] viewer:chrome:packages:messenger:* -viewer:defaults:pref:mailnews.js viewer:Components:MsgAddrbook.shlb viewer:Components:MsgAddrbook.xpt viewer:Components:mimeEmitter.shlb diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index bce983da00ee..8d5652b3d29d 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -193,13 +193,9 @@ bin/chrome/skins/modern/* -bin/chrome/packages/core/editor/content/viewsource.xul -bin/chrome/packages/core/communicator/content/domviewer -bin/defaults/pref/editor.js -bin/defaults/pref/all.js -bin/defaults/pref/config.js -bin/defaults/pref/initpref.js -bin/defaults/pref/unix.js -bin/defaults/pref/xpinstall.js -bin/defaults/pref/psm-glue.js +; all the pref files must be part of base +; to prevent migration bugs +bin/defaults/pref/* bin/defaults/profile/* ; this is only here if you have plugins -blizzard ; bin/plugins/* @@ -260,7 +256,6 @@ bin/components/txmgr.xpt bin/components/import.xpt bin/components/absync.xpt bin/chrome/packages/messenger/* -bin/defaults/pref/mailnews.js [chatzilla] diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win index 321c6177927f..1f3cc29958fb 100644 --- a/xpinstall/packager/packages-win +++ b/xpinstall/packager/packages-win @@ -190,13 +190,9 @@ bin\chrome\skins\modern\* -bin\chrome\packages\core\editor\content\viewsource.xul -bin\chrome\packages\core\communicator\content\domviewer -bin\defaults\pref\all.js -bin\defaults\pref\config.js -bin\defaults\pref\initpref.js -bin\defaults\pref\psm-glue.js -bin\defaults\pref\winpref.js -bin\defaults\pref\xpinstall.js -bin\defaults\pref\editor.js +; all the pref files must be part of base +; to prevent migration bugs +bin\defaults\pref\* bin\defaults\profile\* bin\searchplugins\* bin\res\html.css @@ -257,7 +253,6 @@ bin\components\impText.dll bin\components\absyncsv.dll bin\components\absync.xpt bin\chrome\packages\messenger\* -bin\defaults\pref\mailnews.js [chatzilla] bin\components\chatzilla-service.js