1 diff -urN mozilla.orig//calendar/lightning/install.rdf mozilla/calendar/lightning/install.rdf
2 --- mozilla.orig//calendar/lightning/install.rdf 2010-07-05 21:35:28.425408088 +0200
3 +++ mozilla/calendar/lightning/install.rdf 2010-07-05 21:39:36.114349634 +0200
5 <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
6 <em:name>Lightning</em:name>
7 <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
8 - <em:description>An integrated calendar for Thunderbird</em:description>
9 + <em:description>An integrated calendar for Icedove</em:description>
10 #ifdef LIGHTNING_PRERELEASE_VERSION
11 <em:developer>Build ID: @GRE_BUILDID@</em:developer>
13 diff -urN mozilla.orig//calendar/locales/en-US/chrome/lightning/lightning.properties mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties
14 --- mozilla.orig//calendar/locales/en-US/chrome/lightning/lightning.properties 2010-07-05 21:35:28.495173642 +0200
15 +++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2010-07-05 21:39:36.114349634 +0200
19 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
20 -extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
21 +extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
22 extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
25 diff -urN mozilla.orig//mail/app/application.ini mozilla/mail/app/application.ini
26 --- mozilla.orig//mail/app/application.ini 2010-07-05 21:35:29.238749304 +0200
27 +++ mozilla/mail/app/application.ini 2010-07-05 21:39:36.141016423 +0200
36 #ifdef MOZ_SOURCE_REPO
37 diff -urN mozilla.orig//mail/app/profile/all-thunderbird.js mozilla/mail/app/profile/all-thunderbird.js
38 --- mozilla.orig//mail/app/profile/all-thunderbird.js 2010-07-05 21:35:29.331249108 +0200
39 +++ mozilla/mail/app/profile/all-thunderbird.js 2010-07-05 21:39:36.164349628 +0200
41 // App-specific update preferences
43 // Whether or not app updates are enabled
44 -pref("app.update.enabled", true);
45 +pref("app.update.enabled", false);
47 // This preference turns on app.update.mode and allows automatic download and
48 // install to take place. We use a separate boolean toggle for this to make
51 // URL user can browse to manually if for some reason all update installation
52 // attempts fail. TODO: Change this URL
53 -pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");
54 +pref("app.update.url.manual", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/");
55 // A default value for the "More information about this update" link
56 // supplied in the "An update is available" page of the update wizard.
57 -pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/%APP%/releases/");
58 +pref("app.update.url.details", "http://www.mozillamessaging.com/%LOCALE%/thunderbird/releases/");
59 // User-settable override to app.update.url for testing purposes.
60 //pref("app.update.url.override", "");
63 pref("app.update.showInstalledUI", false);
66 -pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
67 +pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
69 // Base URL for web-based support pages.
70 -pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
71 +pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
73 // Blocklist preferences
74 pref("extensions.blocklist.enabled", true);
76 pref("extensions.update.interval", 86400); // Check for updates to Extensions and
78 // Non-symmetric (not shared by extensions) extension-specific [update] preferences
79 -pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
80 -pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
81 -pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
82 +pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/extensions/");
83 +pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/themes/");
84 +pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/thunderbird/%VERSION%/plugins/");
85 pref("extensions.dss.enabled", false); // Dynamic Skin Switching
86 pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
90 // Preferences for the Get Add-ons pane
91 pref("extensions.getAddons.showPane", true);
92 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
93 +pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/thunderbird");
94 pref("extensions.getAddons.maxResults", 5);
95 -pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
96 -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
97 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
98 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
99 +pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/recommended");
100 +pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
101 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
102 +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
104 pref("xpinstall.whitelist.add", "update.mozilla.org");
105 pref("xpinstall.whitelist.add.36", "getpersonas.com");
107 pref("news.directory", "");
108 pref("spellchecker.dictionary", "");
109 // Dictionary download preference
110 -pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
111 +pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/dictionaries/");
113 // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
114 // mail application without any user intervention. Possible values are:
116 pref("mailnews.database.global.logging.console", true);
118 // page to load to find good header add-ons
119 -pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
120 +pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
122 // Serif fonts look dated. Switching those language families to sans-serif
123 // where we think it makes sense. Worth investigating for other font families
124 diff -urN mozilla.orig//mail/base/content/baseMenuOverlay.xul mozilla/mail/base/content/baseMenuOverlay.xul
125 --- mozilla.orig//mail/base/content/baseMenuOverlay.xul 2010-07-05 21:35:29.344789211 +0200
126 +++ mozilla/mail/base/content/baseMenuOverlay.xul 2010-07-05 21:39:36.174349684 +0200
128 oncommand="openSupportURL();"
131 - <menuitem id="releaseNotes"
132 - label="&releaseCmd.label;" accesskey="&releaseCmd.accesskey;"
133 - oncommand="openFormattedURL('app.releaseNotesURL');"/>
134 <menuitem id="whatsNew"
135 label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
136 oncommand="openWhatsNew();"/>
137 diff -urN mozilla.orig//mail/base/content/credits.xhtml mozilla/mail/base/content/credits.xhtml
138 --- mozilla.orig//mail/base/content/credits.xhtml 2010-07-05 21:35:29.344789211 +0200
139 +++ mozilla/mail/base/content/credits.xhtml 2010-07-05 21:44:34.520940060 +0200
143 <div id="creditsBox">
144 - <h2 class="title">&brandFullName;™
145 + <h2 class="title">&brandFullName;
146 <div class="motto">&brandMotto;</div>
150 <p id="gecko" class="center">&credit.poweredByGecko;</p>
153 - Mozilla Thunderbird™ and the Thunderbird logo are trademarks of the Mozilla
154 - Foundation. You are not granted rights or licenses to the trademarks
155 - of the Mozilla Foundation or any party, including without limitation the
156 - Thunderbird name or logo.</p>
158 - <p class="footnote">
159 U.S. GOVERNMENT END USERS. The Software is a “commercial item,”
160 as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
161 “commercial computer software” and “commercial computer software
162 diff -urN mozilla.orig//mail/confvars.sh mozilla/mail/confvars.sh
163 --- mozilla.orig//mail/confvars.sh 2010-07-05 21:35:29.801718821 +0200
164 +++ mozilla/mail/confvars.sh 2010-07-05 21:39:36.174349684 +0200
167 # ***** END LICENSE BLOCK *****
169 -MOZ_APP_NAME=thunderbird
170 +MOZ_APP_NAME=icedove
173 MOZ_NO_ACTIVEX_SUPPORT=1
174 diff -urN mozilla.orig//mail/locales/en-US/chrome/messenger/credits.dtd mozilla/mail/locales/en-US/chrome/messenger/credits.dtd
175 --- mozilla.orig//mail/locales/en-US/chrome/messenger/credits.dtd 2010-07-05 21:35:30.087529062 +0200
176 +++ mozilla/mail/locales/en-US/chrome/messenger/credits.dtd 2010-07-05 21:39:36.174349684 +0200
178 <!ENTITY credit.title "&brandFullName; Credits">
179 -<!ENTITY brandMotto "Thunderbirds Are Go!">
180 +<!ENTITY brandMotto "Icedoves Are Free!">
181 <!ENTITY credit.thanks "Special Thanks To">
183 <!-- localization credits look like this: -->
184 diff -urN mozilla.orig//mozilla/toolkit/xre/nsAppRunner.cpp mozilla/mozilla/toolkit/xre/nsAppRunner.cpp
185 --- mozilla.orig//mozilla/toolkit/xre/nsAppRunner.cpp 2010-07-05 21:36:51.774157698 +0200
186 +++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2010-07-05 21:39:36.177475358 +0200
187 @@ -1334,8 +1334,7 @@
192 - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
193 + printf("%s %s", gAppData->name, gAppData->version);
194 if (gAppData->copyright)
195 printf(", %s", gAppData->copyright);
197 --- mozilla/mail/build.mk.org 2010-09-08 14:21:26.169329050 +0200
198 +++ mozilla/mail/build.mk 2010-09-08 14:24:01.644480272 +0200
199 @@ -119,7 +119,7 @@ endif
200 PROGRAM = ../../../$(DIST)/$(APP_NAME).app/
203 -PROGRAM = ../../../$(DIST)/bin/thunderbird$(BIN_SUFFIX)
204 +PROGRAM = ../../../$(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)