# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1328686342 -3600
# Node ID 0ede69b7a9256b46dbb8dcc676d83cdd5991906f
# Parent  c4f16782fc7aceebae66c68ba60235166e8284b4# Parent  0887a88b1e8536c19616537f72a484c72abb8cd5
merge from default

diff -r 0887a88b1e85 -r 0ede69b7a925 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Feb 08 08:31:42 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Feb 08 08:32:22 2012 +0100
@@ -18,7 +18,7 @@
 
 
 %define major 10
-%define mainver %major.0
+%define mainver %major.0esr
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
diff -r 0887a88b1e85 -r 0ede69b7a925 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Wed Feb 08 08:31:42 2012 +0100
+++ b/MozillaFirefox/create-tar.sh	Wed Feb 08 08:32:22 2012 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="esr10"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_RELEASE"
-VERSION="10.0"
+RELEASE_TAG="FIREFOX_10_0esr_RELEASE"
+VERSION="10.0esr"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
@@ -24,7 +24,7 @@
     ja-JP-mac|en-US)
       ;;
     *)
-      hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
+      hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
       [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
       ;;
   esac
diff -r 0887a88b1e85 -r 0ede69b7a925 xulrunner/create-tar.sh
--- a/xulrunner/create-tar.sh	Wed Feb 08 08:31:42 2012 +0100
+++ b/xulrunner/create-tar.sh	Wed Feb 08 08:32:22 2012 +0100
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="esr10"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_RELEASE"
+RELEASE_TAG="FIREFOX_10_0esr_RELEASE"
 VERSION="10.0"
 
 # mozilla
@@ -24,7 +24,7 @@
     ja-JP-mac|en-US)
       ;;
     *)
-      hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
+      hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
       [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
       ;;
   esac
diff -r 0887a88b1e85 -r 0ede69b7a925 xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Wed Feb 08 08:31:42 2012 +0100
+++ b/xulrunner/xulrunner.spec	Wed Feb 08 08:32:22 2012 +0100
@@ -43,7 +43,7 @@
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.8.9
 BuildRequires:  mozilla-nss-devel >= 3.13.1
-Version:        10.0
+Version:        10.0esr
 Release:        0
 %define         releasedate 2012012900
 %define         version_internal 10.0