Bump versions, client.py and add extra test preferences following merge to aurora. a=auroramerge
Bump versions, client.py and add extra test preferences following merge to aurora. a=auroramerge
--- a/calendar/sunbird/config/version.txt
+++ b/calendar/sunbird/config/version.txt
@@ -1,1 +1,1 @@
-1.4a1
+1.4a2
--- a/client.py
+++ b/client.py
@@ -12,25 +12,25 @@ DEFAULTS = {
'REV': "default",
# LDAPSDKS
'LDAPSDKS_REPO': 'http://hg.mozilla.org/projects/ldap-sdks/',
'LDAPSDKS_REV': 'LDAPCSDK_6_0_7D_RTM',
# URL of the default hg repository to clone for ChatZilla.
'CHATZILLA_REPO': 'http://hg.mozilla.org/chatzilla/',
-
+ CHATZILLA_REV: CHATZILLA_0_9_88_RELEASE,
# URL of the default hg repository to clone for DOM Inspector.
'INSPECTOR_REPO': 'http://hg.mozilla.org/dom-inspector/',
-
+ INSPECTOR_REV: DOMI_2_0_10,
# URL of the default hg repository to clone for Venkman.
'VENKMAN_REPO': 'http://hg.mozilla.org/venkman/',
-
+ VENKMAN_REV: a38583d7164a,
# URL of the default hg repository to clone for Mozilla.
- 'MOZILLA_REPO': 'http://hg.mozilla.org/mozilla-central/',
+ 'MOZILLA_REPO': 'http://hg.mozilla.org/releases/mozilla-aurora/',
}
REPO_SHORT_NAMES = {
'mozilla-central': 'moz',
'dom-inspector': 'dom',
'ldap-sdks': 'ldap',
}
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-12.0a1
+12.0a2
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -52,10 +52,10 @@ MOZ_STATIC_BUILD_UNSUPPORTED=1
MOZ_APP_COMPONENT_LIBS="xpautocomplete mailcomps $MAIL_COMPONENT $LDAP_COMPONENT $MORK_COMPONENT"
MOZ_APP_COMPONENT_MODULES="MODULE(xpAutoComplete) MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
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_BRANDING_DIRECTORY=mail/branding/nightly
+MOZ_BRANDING_DIRECTORY=mail/branding/aurora
MOZ_OFFICIAL_BRANDING_DIRECTORY=other-licenses/branding/thunderbird
--- a/mail/locales/all-locales
+++ b/mail/locales/all-locales
@@ -1,10 +1,11 @@
af
ar
+ast
be
bg
bn-BD
br
ca
cs
da
de
@@ -16,17 +17,19 @@ et
eu
fi
fr
fy-NL
ga-IE
gd
gl
he
+hr
hu
+hy-AM
id
is
it
ja
ja-JP-mac
ka
ko
lt
--- a/mail/test/mozmill/migration-from-tb2/prefs.js
+++ b/mail/test/mozmill/migration-from-tb2/prefs.js
@@ -7,17 +7,18 @@
*
* To make a manual change to preferences, you can visit the URL about:config
* For more information, see http://www.mozilla.org/unix/customizing.html#prefs
*/
user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1273257684);
user_pref("app.update.lastUpdateTime.background-update-timer", 1273257684);
user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1273257684);
-user_pref("extensions.checkCompatibility.nightly", false);
+user_pref("extensions.checkCompatibility.12.0a", false);
+user_pref("extensions.checkCompatibility.12.0", false);
user_pref("extensions.getAddons.cache.enabled", false);
user_pref("extensions.testpilot.lastversion", "1.0");
user_pref("extensions.autoDisableScopes", 10);
user_pref("intl.charsetmenu.mailview.cache", "windows-1252, ISO-8859-1, UTF-8");
user_pref("ldap_2.prefs_migrated", true);
user_pref("ldap_2.servers.default.filename", "default.mab");
user_pref("ldap_2.servers.default.replication.lastChangeNumber", 0);
user_pref("ldap_2.servers.default.uri", "moz-abldapdirectory://default.mab");
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -135,17 +135,18 @@ class ThunderTestProfile(mozrunner.Thund
# 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.12.0a': False,
+ 'extensions.checkCompatibility.12.0': False,
# Stop any pings to AMO on add-on install
'extensions.getAddons.cache.enabled': False,
# Disable test pilot new tab (this can be set to anything currently, just needs to be set).
'extensions.testpilot.lastversion': '1.0',
# 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.
--- a/suite/config/version.txt
+++ b/suite/config/version.txt
@@ -1,1 +1,1 @@
-2.9a1
+2.9a2