Version bumps for SeaMonkey and Thunderbird a=auroramerge,ba=auroramerge CLOSED TREE
Version bumps for SeaMonkey and Thunderbird a=auroramerge,ba=auroramerge CLOSED TREE
--- a/calendar/locales/all-locales
+++ b/calendar/locales/all-locales
@@ -1,43 +1,47 @@
ar
bg
+br
ca
cs
cy
da
de
+dsb
en-GB
es-AR
es-ES
et
eu
fi
fr
fy-NL
ga-IE
gd
gl
he
hr
+hsb
hu
id
is
it
ja
ja-JP-mac
ka
ko
lt
nb-NO
nl
nn-NO
pa-IN
pl
pt-PT
+rm
ro
ru
sk
sl
sq
sv-SE
tr
uk
--- a/client.py
+++ b/client.py
@@ -12,26 +12,26 @@
# Define x_REV to override. Where x can be one of:
# "COMM", "MOZILLA", "CHATZILLA", "INSPECTOR"
DEFAULTS = {
# Global Default Revision
'REV': "default",
# URL of the default hg repository to clone for ChatZilla.
'CHATZILLA_REPO': 'https://hg.mozilla.org/chatzilla/',
- # The stable revision to use for the next branch
- # 'CHATZILLA_REV': 'SEA2_37_RELBRANCH',
+ # The stable revision to use
+ 'CHATZILLA_REV': 'SEA2_37_RELBRANCH',
# URL of the default hg repository to clone for DOM Inspector.
'INSPECTOR_REPO': 'https://hg.mozilla.org/dom-inspector/',
- # The stable revision to use for the next branch
- # 'INSPECTOR_REV': 'DOMI_2_0_16',
+ # The stable revision to use
+ 'INSPECTOR_REV': 'DOMI_2_0_16',
# URL of the default hg repository to clone for Mozilla.
- 'MOZILLA_REPO': 'https://hg.mozilla.org/mozilla-central/',
+ 'MOZILLA_REPO': 'https://hg.mozilla.org/releases/mozilla-aurora/',
}
REPO_SHORT_NAMES = {
'mozilla-central': 'moz',
'dom-inspector': 'dom',
}
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,15 +1,13 @@
. $topsrcdir/build/unix/mozconfig.linux32
ac_add_options --enable-application=mail
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
ac_add_options --enable-calendar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
# For NSS symbols
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,15 +1,13 @@
. $topsrcdir/build/unix/mozconfig.linux
ac_add_options --enable-application=mail
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
ac_add_options --enable-calendar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
# For NSS symbols
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -13,17 +13,16 @@ mk_add_options MOZ_POSTFLIGHT_ALL+=calen
. $topsrcdir/build/macosx/universal/mozconfig
# Universal builds override the default of mail (bug 575283 comment 29)
ac_add_options --enable-application=mail
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --disable-install-strip
-ac_add_options --enable-profiling
ac_add_options --enable-calendar
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,17 +1,16 @@
. "$topsrcdir/build/mozconfig.win-common"
. "$topsrcdir/build/mozconfig.common"
ac_add_options --enable-application=mail
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-jemalloc
ac_add_options --enable-require-all-d3dc-versions
-ac_add_options --enable-profiling
ac_add_options --enable-calendar
# For NSS symbols
export MOZ_DEBUG_SYMBOLS=1
export MOZ_TELEMETRY_REPORTING=1
# Needed to enable breakpad in application.ini
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -3,17 +3,16 @@
ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32
ac_add_options --enable-application=mail
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging
ac_add_options --enable-jemalloc
-ac_add_options --enable-profiling
ac_add_options --enable-calendar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
# Disable checking that add-ons are signed by the trusted root
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-43.0a1
+43.0a2
old mode 100755
new mode 100644
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -26,25 +26,25 @@ MOZ_MEDIA_NAVIGATOR=1
MOZ_MORK=1
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
THUNDERBIRD_VERSION=$MOZ_APP_VERSION
MOZ_UA_BUILDID=20100101
-MOZ_BRANDING_DIRECTORY=mail/branding/nightly
+MOZ_BRANDING_DIRECTORY=mail/branding/aurora
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.
# If more than one ID is needed, then you should use a comma separated list
# of values.
-ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-central
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-aurora
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-central
+MAR_CHANNEL_ID=thunderbird-comm-aurora
# Enable generational GC on desktop.
JSGC_GENERATIONAL=1
MOZ_PROFILE_MIGRATOR=1
MOZ_JSDOWNLOADS=1
MOZ_BINARY_EXTENSIONS=1
# Enable building ./signmar and running libmar signature tests
MOZ_ENABLE_SIGNMAR=1
--- a/mail/locales/all-locales
+++ b/mail/locales/all-locales
@@ -1,32 +1,38 @@
af
ar
+ast
be
bg
bn-BD
br
ca
cs
+cy
da
de
+dsb
el
en-GB
es-AR
es-ES
et
eu
fi
fr
fy-NL
ga-IE
gd
gl
he
+hr
+hsb
hu
+hy-AM
id
is
it
ja
ja-JP-mac
ka
ko
lt
old mode 100755
new mode 100644
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -99,17 +99,17 @@ class ThunderTestProfile(mozprofile.Thun
# disable the first use junk dialog
'mailnews.ui.junk.firstuse': False,
# set the relative dirs properly
'mail.root.none-rel' : "[ProfD]Mail",
'mail.root.pop3-rel' : "[ProfD]Mail",
# Do not allow check new mail to be set
'mail.startup.enabledMailCheckOnce' : True,
# Disable compatibility checking
- 'extensions.checkCompatibility.nightly': False,
+ 'extensions.checkCompatibility.43.0a': False,
# Stop any pings to AMO on add-on install
'extensions.getAddons.cache.enabled': False,
# In case a developer is working on a laptop without a network
# connection, don't detect offline mode; hence we'll still startup
# online which is what mozmill currently requires. It'll also protect us
# from any random network failures.
'offline.autoDetect': False,
# Don't load what's new or the remote start page - keep everything local
--- a/suite/config/version.txt
+++ b/suite/config/version.txt
@@ -1,1 +1,1 @@
-2.40a1
+2.40a2