summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2017-05-12 14:06:26 +0200
committerAndreas Grapentin <andreas@grapentin.org>2017-05-12 14:06:26 +0200
commit8233f5c5d2bc2d299d924f5f1e6a47e7d3e83fe6 (patch)
treede96ff5d615300e6f3e474a9f1c72d04e29dc953
parent48ed377167db9728eb6d95c815638c4d7998ed13 (diff)
updated branding patches for icedove-52.152.1-152.1
-rwxr-xr-xrelease.sh2
-rw-r--r--src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch27
-rw-r--r--src/patches/icedove/fix-installdir.patch2
-rw-r--r--src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch8
4 files changed, 15 insertions, 24 deletions
diff --git a/release.sh b/release.sh
index 12f77b5..beb1ffe 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
set -eu
pkgname=icedove
-pkgver=45.5.0
+pkgver=52.1
pkgrel=1
srcdir=src
diff --git a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
index aaa72c5..55f8fd2 100644
--- a/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
+++ b/src/patches/icedove/fix-branding-in-migration-wizard-and-the-addon-manag.patch
@@ -20,25 +20,25 @@ index db3b25d..ac240c6 100644
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", "");
+-pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/%APP%/releases/");
++pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/thunderbird/releases/");
+
+ // app.update.promptWaitTime is in branding section
@@ -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%");
+-pref("app.releaseNotesURL", "https://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("app.releaseNotesURL", "https://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");");
+ "https://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%/");
+-pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
++pref("app.support.baseURL", "https://support.live.mozillamessaging.com/%LOCALE%/thunderbird/%APPBUILDID%/");
// Show error messages in error console.
pref("javascript.options.showInConsole", true);
@@ -91,15 +91,6 @@ index db3b25d..ac240c6 100644
// 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:
-@@ -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
--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
@@ -756,7 +757,7 @@ pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
diff --git a/src/patches/icedove/fix-installdir.patch b/src/patches/icedove/fix-installdir.patch
index be2660b..0ad46c6 100644
--- a/src/patches/icedove/fix-installdir.patch
+++ b/src/patches/icedove/fix-installdir.patch
@@ -22,7 +22,7 @@ index 74c164b..1c9ea15 100644
+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(installdir)/chrome/icons/default
endif
- ifdef MOZ_WIDGET_GTK
+ ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
+
diff --git a/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch b/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch
index a73af99..6f01f4f 100644
--- a/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch
+++ b/src/patches/iceowl/Change-extension-s-name-to-Iceowl.patch
@@ -18,8 +18,8 @@ index ae6dbd2..f71d848 100644
<em:id>@XPI_EM_ID@</em:id>
- <em:name>Lightning</em:name>
+ <em:name>Iceowl</em:name>
- <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@GRE_BUILDID@ -->
- <em:description>An integrated calendar for Thunderbird</em:description>
+ <em:version>@LIGHTNING_VERSION@</em:version> <!-- BuildID=@MOZ_BUILDID@ -->
+ <em:description>Integrated Calendaring &amp; Scheduling for your Email client</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 f15d3ab..ee96858 100644
@@ -29,7 +29,7 @@ index f15d3ab..ee96858 100644
# extension:
extensions.calendar-timezones@mozilla.org.name=Timezone Definitions for Mozilla Calendar
--extensions.calendar-timezones@mozilla.org.description=Timezone definitions required by Sunbird and Lightning
+-extensions.calendar-timezones@mozilla.org.description=Timezone definitions required by Lightning
+extensions.calendar-timezones@mozilla.org.description=Timezone definitions required by Lightning and Iceowl
extensions.calendar-timezones@mozilla.org.creator=Mozilla Calendar Project
@@ -43,7 +43,7 @@ index 3c61d82..2089f1c 100644
# 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=Integrated Calendaring & Scheduling for your Email client
-extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.creator=Mozilla Calendar Project
+extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.name=Iceowl
+extensions.{e2fda1a4-762b-4020-b5ad-a41df1933103}.description=An integrated calendar for Icedove