Update client.py to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE
RELEASE_34_END
Update client.py to pull from mozilla-release by default a=releasemerge ba=releasemerge CLOSED TREE
old mode 100755
new mode 100644
--- a/client.py
+++ b/client.py
@@ -25,17 +25,17 @@ DEFAULTS = {
'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
'INSPECTOR_REV': 'SEA2_26_RELBRANCH',
# URL of the default hg repository to clone for Mozilla.
- 'MOZILLA_REPO': 'https://hg.mozilla.org/releases/mozilla-beta/',
+ 'MOZILLA_REPO': 'https://hg.mozilla.org/releases/mozilla-release/',
}
REPO_SHORT_NAMES = {
'mozilla-central': 'moz',
'dom-inspector': 'dom',
'ldap-sdks': 'ldap',
}
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -32,14 +32,14 @@ THUNDERBIRD_VERSION=$MOZ_APP_VERSION
MOZ_UA_BUILDID=20100101
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-beta,thunderbird-comm-release
+ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-release
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=thunderbird-comm-beta
+MAR_CHANNEL_ID=thunderbird-comm-release
if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
MOZ_FOLD_LIBS=1
fi