X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=icedove-branding.patch;h=88f008259f4796b6a52c64a91b0304858fbf6ec5;hb=c03e9b1;hp=81391e71f4a1147e717305e3a96a51b0fd00609c;hpb=71f4b9e9afd333a018213f19afdfe089602a4c35;p=packages%2Ficedove.git
diff --git a/icedove-branding.patch b/icedove-branding.patch
index 81391e7..88f0082 100644
--- a/icedove-branding.patch
+++ b/icedove-branding.patch
@@ -1,26 +1,158 @@
---- comm-1.9.1/mozilla/configure.orig 2009-12-18 15:06:50.144206912 +0100
-+++ comm-1.9.1/mozilla/configure 2009-12-18 15:07:35.791285838 +0100
-@@ -13390,8 +13390,8 @@
- ;;
-
- standalone)
-- MOZ_APP_NAME=mozilla
-- MOZ_APP_DISPLAYNAME=Mozilla
-+ MOZ_APP_NAME=icedove
-+ MOZ_APP_DISPLAYNAME=Icedove
- MOZ_APP_VERSION=$MOZILLA_VERSION
- ;;
-
---- comm-1.9.1/mozilla/configure.in.orig 2009-12-18 15:07:49.984408790 +0100
-+++ comm-1.9.1/mozilla/configure.in 2009-12-18 15:08:12.906912163 +0100
-@@ -4664,8 +4664,8 @@
- ;;
-
- standalone)
-- MOZ_APP_NAME=mozilla
-- MOZ_APP_DISPLAYNAME=Mozilla
-+ MOZ_APP_NAME=icedove
-+ MOZ_APP_DISPLAYNAME=Icedove
- MOZ_APP_VERSION=$MOZILLA_VERSION
- ;;
+--- mozilla/calendar/lightning/install.rdf~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/calendar/lightning/install.rdf 2011-09-17 15:22:37.326572866 +0200
+@@ -28,7 +28,7 @@
+ @XPI_EM_ID@
+ Lightning
+ @LIGHTNING_VERSION@
+- An integrated calendar for Thunderbird
++ An integrated calendar for Icedove
+ #ifdef LIGHTNING_PRERELEASE_VERSION
+ Build ID: @GRE_BUILDID@
+ #endif
+--- mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/calendar/locales/en-US/chrome/lightning/lightning.properties 2011-09-17 15:23:40.476566690 +0200
+@@ -39,7 +39,7 @@
+ # addon description:
+ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Lightning
+-extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Thunderbird
++extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove
+ extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
+
+ # Lightning branding
+--- mozilla/im/app/application.ini~ 2011-08-12 15:52:04.000000000 +0200
++++ mozilla/im/app/application.ini 2011-09-17 15:24:45.833226544 +0200
+@@ -37,7 +37,7 @@
+
+ #filter substitution
+ [App]
+-Name=Instantbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+--- mozilla/mail/app/profile/all-thunderbird.js.orig 2012-03-13 03:37:11.000000000 +0100
++++ mozilla/mail/app/profile/all-thunderbird.js 2012-03-24 21:42:35.608437888 +0100
+@@ -84,7 +84,7 @@
+ pref("app.update.certs.2.commonName", "aus4.mozilla.org");
+
+ // Whether or not app updates are enabled
+-pref("app.update.enabled", true);
++pref("app.update.enabled", false);
+
+ // This preference turns on app.update.mode and allows automatic download and
+ // install to take place. We use a separate boolean toggle for this to make
+@@ -120,7 +119,7 @@ pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%B
+ pref("app.update.url.manual", "http://www.getthunderbird.com");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard.
+-pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/");
++pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/thunderbird/releases/");
+ // User-settable override to app.update.url for testing purposes.
+ //pref("app.update.url.override", "");
+
+@@ -149,7 +148,7 @@ pref("toolkit.crashreporter.infoURL",
+ "http://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");");
+
+ // Base URL for web-based support pages.
+-pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
++pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
+
+ // Show error messages in error console.
+ pref("javascript.options.showInConsole", true);
+@@ -178,18 +177,18 @@ pref("extensions.autoDisableScopes", 15);
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
++pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
++pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
+
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+ pref("extensions.blocklist.interval", 86400);
+ pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/");
+-pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/");
+-pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%");
++pref("extensions.blocklist.detailsURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/blocked/");
++pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/thunderbird/blocked/%blockID%");
+
+ // Enables some extra Extension System Logging (can reduce performance)
+ pref("extensions.logging.enabled", false);
+@@ -209,7 +208,8 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla
+ pref("extensions.update.interval", 86400); // Check for updates to Extensions and
+ // Themes every day
+
+-pref("extensions.dss.enabled", false); // Dynamic Skin Switching
++pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
++pref("extensions.dss.enabled", false); // Dynamic Skin Switching
+ pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
+
+ pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://messenger/locale/messenger.properties");
+@@ -424,7 +424,7 @@ pref("browser.helperApps.deleteTempFileOnExit", true);
+
+ pref("spellchecker.dictionary", "");
+ // Dictionary download preference
+-pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
++pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
+
+ // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
+ // mail application without any user intervention. Possible values are:
+@@ -559,7 +559,7 @@ pref("mailnews.database.global.logging.console", true);
+ pref("mailnews.database.global.search.msg.limit", 1000);
+
+ // page to load to find good header add-ons
+-pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/%APP%/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
++pref("mailnews.migration.header_addons_url","http://live.mozillamessaging.com/thunderbird/addons/search?q=header&locale=%LOCALE%&lver=%VERSION%&hver=%VERSION%&os=%OS%");
+
+ // Serif fonts look dated. Switching those language families to sans-serif
+ // where we think it makes sense. Worth investigating for other font families
+@@ -751,7 +751,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
+
+ pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
+ pref("plugins.update.notifyUser", false);
+-pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/%APP%/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("plugins.crash.supportUrl", "https://live.mozillamessaging.com/thunderbird/plugin-crashed?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Click-to-play has not been ported for TB yet, see bug 814168.
+ // The default plugin state should be changed to "ask to activate" when this
+--- mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd~
++++ mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd
+@@ -78,7 +78,7 @@
+
+
+
+-
++
+
+
+
+--- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200
++++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200
+@@ -6,8 +6,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-MOZ_APP_BASENAME=Thunderbird
+-MOZ_APP_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
++MOZ_APP_NAME=icedove
+ MOZ_UPDATER=1
+ MOZ_THUNDERBIRD=1
+ MOZ_CHROME_FILE_FORMAT=omni
+@@ -30,7 +30,7 @@
+
+ MOZ_UA_BUILDID=20100101
+
+-MOZ_BRANDING_DIRECTORY=mail/branding/aurora
++MOZ_BRANDING_DIRECTORY=icedove/branding
+ MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
+ MOZ_APP_ID={3550f703-e582-4d05-9a08-453d09bdfdc6}
+ # This should usually be the same as the value MAR_CHANNEL_ID.