Version bumps for SeaMonkey and Thunderbird a=auroramerge,ba=auroramerge CLOSED TREE
authorMark Banner <standard8@mozilla.com>
Mon, 09 Jun 2014 23:17:47 +0100
changeset 20234 304c77df9a71741275d6671f11dbb98a7aedb696
parent 20233 4e1e0850f0a15ae94ba4559ba7257e239aab34a4
child 20235 a293048deaae2d22aa701ef68f6f920667510b9c
push idunknown
push userunknown
push dateunknown
reviewersauroramerge
Version bumps for SeaMonkey and Thunderbird a=auroramerge,ba=auroramerge CLOSED TREE
client.py
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/macosx-universal/nightly
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win64/nightly
mail/config/version.txt
mail/confvars.sh
mail/locales/all-locales
mail/test/mozmill/runtest.py
suite/config/version.txt
--- a/client.py
+++ b/client.py
@@ -16,31 +16,31 @@ DEFAULTS = {
   'REV': "default",
 
   # LDAPSDKS
   'LDAPSDKS_REPO': 'https://hg.mozilla.org/projects/ldap-sdks/',
   'LDAPSDKS_REV': 'LDAPCSDK_6_0_7F_RTM',
 
   # 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_26_RELBRANCH',
+  # The stable revision to use
+  'CHATZILLA_REV':  'SEA2_26_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':  'SEA2_26_RELBRANCH',
+  # The stable revision to use
+  'INSPECTOR_REV':  'SEA2_26_RELBRANCH',
 
   # URL of the default hg repository to clone for Venkman.
   'VENKMAN_REPO': 'https://hg.mozilla.org/venkman/',
-  # The stable revision to use for the next branch
-#  'VENKMAN_REV':  'SEA2_26_RELBRANCH',
+  # The stable revision to use
+  'VENKMAN_REV':  'SEA2_26_RELBRANCH',
 
   # 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',
 'ldap-sdks':        'ldap',
 }
 
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,17 +1,15 @@
 no_tooltool=1
 . $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-signmar
-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,17 +1,15 @@
 no_tooltool=1
 . $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-signmar
-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
@@ -10,17 +10,16 @@ fi
 . $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-signmar
-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.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-signmar
-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-signmar
-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
 
 . $topsrcdir/build/win64/mozconfig.vs2010
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-32.0a1
+32.0a2
old mode 100755
new mode 100644
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -25,20 +25,20 @@ MOZ_MORK=1
 MAIL_MODULE="MODULE(nsMailModule) MODULE(nsImportServiceModule)"
 
 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
 if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
   MOZ_FOLD_LIBS=1
 fi
--- 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
old mode 100755
new mode 100644
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -116,17 +116,17 @@ 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.32.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.29a1
+2.29a2