Import modifications from the 45.5.0 version that is the latest branding one45.5.0

6 files changed, 67 insertions, 44 deletions

diff --git a/patches/debian-hacks/Icedove-branding.patch b/patches/debian-hacks/Icedove-branding.patch
new file mode 100644
index 0000000..bc57894
--- /dev/null
+++ b/patches/debian-hacks/Icedove-branding.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Sat, 24 Nov 2012 11:36:16 +0100
+Subject: Icedove branding
+
+---
+ im/app/application.ini | 2 +-
+ mail/confvars.sh       | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/im/app/application.ini b/im/app/application.ini
+index 856b900..9ffa5d8 100644
+--- a/im/app/application.ini
++++ b/im/app/application.ini
+@@ -4,7 +4,7 @@
+ 
+ #filter substitution
+ [App]
+-Name=Instantbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+diff --git a/mail/confvars.sh b/mail/confvars.sh
+index bbf6f2d..57d0097 100644
+--- a/mail/confvars.sh
++++ b/mail/confvars.sh
+@@ -3,8 +3,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_APP_STATIC_INI=1
diff --git a/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch b/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
index 95c4b40..aaa72c5 100644
--- a/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
+++ b/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
@@ -8,20 +8,15 @@ addon-checking/installing/updating will work
 
 Closes: #565559
 ---
- mail/app/profile/all-thunderbird.js                | 28 +++++++++++-----------
+ mail/app/profile/all-thunderbird.js                | 33 +++++++++++-----------
  .../en-US/chrome/messenger/accountCreation.dtd     |  2 +-
- 2 files changed, 15 insertions(+), 15 deletions(-)
+ 2 files changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js
-index e8db9cf..d607136 100644
+index db3b25d..ac240c6 100644
 --- a/mail/app/profile/all-thunderbird.js
 +++ b/mail/app/profile/all-thunderbird.js
-@@ -1,4 +1,3 @@
--/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
- /* This Source Code Form is subject to the terms of the Mozilla Public
-  * 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/. */
-@@ -120,7 +119,7 @@ pref("app.update.url", "https://aus4.mozilla.org/update/3/%PRODUCT%/%VERSION%/%B
+@@ -118,7 +118,7 @@ pref("app.update.url", "https://aus5.mozilla.org/update/6/%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.
@@ -30,7 +25,15 @@ index e8db9cf..d607136 100644
  // User-settable override to app.update.url for testing purposes.
  //pref("app.update.url.override", "");
  
-@@ -149,7 +148,7 @@ pref("toolkit.crashreporter.infoURL",
+@@ -140,14 +140,14 @@ pref("app.update.service.enabled", true);
+ #endif
+ 
+ // Release notes URL
+-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("app.releaseNotesURL", "http://live.mozillamessaging.com/thunderbird/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+ 
+ // URL for "Learn More" for Crash Reporter.
+ pref("toolkit.crashreporter.infoURL",
       "http://www.mozilla.org/thunderbird/legal/privacy/#crash-reporter");");
  
  // Base URL for web-based support pages.
@@ -39,17 +42,21 @@ index e8db9cf..d607136 100644
  
  // Show error messages in error console.
  pref("javascript.options.showInConsole", true);
-@@ -178,18 +177,18 @@ pref("extensions.autoDisableScopes", 15);
+@@ -177,20 +177,20 @@ 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.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
 -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.link.url", "https://addons.mozilla.org/%LOCALE%/thunderbird/");
++pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird");
 +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%");
@@ -65,7 +72,7 @@ index e8db9cf..d607136 100644
  
  // 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
+@@ -210,7 +210,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
  
@@ -75,16 +82,16 @@ index e8db9cf..d607136 100644
  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);
+@@ -429,7 +430,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/");
++pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%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);
+@@ -564,7 +565,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
@@ -93,7 +100,7 @@ index e8db9cf..d607136 100644
  
  // 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);
+@@ -756,7 +757,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);
diff --git a/patches/icedove/fix-installdir.patch b/patches/icedove/fix-installdir.patch
index 36703fd..be2660b 100644
--- a/patches/icedove/fix-installdir.patch
+++ b/patches/icedove/fix-installdir.patch
@@ -7,10 +7,10 @@ Subject: fix installdir
  1 file changed, 9 insertions(+)
 
 diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
-index 8f81701..a65d48d 100644
+index 74c164b..1c9ea15 100644
 --- a/mail/app/Makefile.in
 +++ b/mail/app/Makefile.in
-@@ -108,11 +108,20 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
+@@ -100,11 +100,20 @@ libs:: $(addprefix icons/$(MOZ_WIDGET_TOOLKIT)/,$(DESKTOP_ICON_FILES))
  
  libs:: $(addprefix $(DIST)/branding/,$(BRANDED_ICON_FILES))
  	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/chrome/icons/default
@@ -22,7 +22,7 @@ index 8f81701..a65d48d 100644
 +	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default
  endif
  
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ ifdef MOZ_WIDGET_GTK
  libs::
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 +
diff --git a/patches/icedove/no-dynamic-nss-softokn.patch b/patches/icedove/no-dynamic-nss-softokn.patch
deleted file mode 100644
index 330ea12..0000000
--- a/patches/icedove/no-dynamic-nss-softokn.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Alexander Sack <asac@debian.org>
-Date: Wed, 27 Jan 2010 19:06:07 +0100
-Subject: no dynamic nss softokn
-
----
- ldap/sdks/c-sdk/component_versions.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldap/sdks/c-sdk/component_versions.mk b/ldap/sdks/c-sdk/component_versions.mk
-index 2ad6347..5f61b57 100644
---- a/ldap/sdks/c-sdk/component_versions.mk
-+++ b/ldap/sdks/c-sdk/component_versions.mk
-@@ -46,7 +46,7 @@ NSPR_RELEASE_TREE	= $(COMPONENTS_DIR)
- # NSS - Network Security Services
- NSSVERS			= 3
- NSS_RELEASE_TAG		= NSS_3_9_3_RTM
--NSS_DYNAMIC_SOFTOKN	= 1
-+NSS_DYNAMIC_SOFTOKN	= 0
- NSS_RELEASE_TREE	= $(COMPONENTS_DIR)
- 
- # SVRCORE - Client/server utility library
diff --git a/patches/iceowl/Change-extension-s-name-to-Iceowl.patch b/patches/iceowl/Change-extension-s-name-to-Iceowl.patch
index c0a5292..a73af99 100644
--- a/patches/iceowl/Change-extension-s-name-to-Iceowl.patch
+++ b/patches/iceowl/Change-extension-s-name-to-Iceowl.patch
@@ -22,7 +22,7 @@ index ae6dbd2..f71d848 100644
      <em:description>An integrated calendar for Thunderbird</em:description>
  #ifdef LIGHTNING_PRERELEASE_VERSION
 diff --git a/calendar/locales/en-US/chrome/calendar/timezones.properties b/calendar/locales/en-US/chrome/calendar/timezones.properties
-index 882cc70..8b395bd 100644
+index f15d3ab..ee96858 100644
 --- a/calendar/locales/en-US/chrome/calendar/timezones.properties
 +++ b/calendar/locales/en-US/chrome/calendar/timezones.properties
 @@ -4,7 +4,7 @@
@@ -35,7 +35,7 @@ index 882cc70..8b395bd 100644
  
  pref.timezone.floating=Local Time
 diff --git a/calendar/locales/en-US/chrome/lightning/lightning.properties b/calendar/locales/en-US/chrome/lightning/lightning.properties
-index 78b15b6..6bf260f 100644
+index 3c61d82..2089f1c 100644
 --- a/calendar/locales/en-US/chrome/lightning/lightning.properties
 +++ b/calendar/locales/en-US/chrome/lightning/lightning.properties
 @@ -3,12 +3,12 @@
diff --git a/patches/series b/patches/series
index cf3f11b..19b3d86 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,4 @@
-icedove/fix-installdir.patch
-icedove/no-dynamic-nss-softokn.patch
+debian-hacks/Icedove-branding.patch
 icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
+icedove/fix-installdir.patch
 iceowl/Change-extension-s-name-to-Iceowl.patch