# HG changeset patch # User Wolfgang Rosenauer # Date 1329296011 -3600 # Node ID 6e576750d898b8ea585a112f3091c62122454622 # Parent 0ede69b7a9256b46dbb8dcc676d83cdd5991906f# Parent fa6644729e7fb136f0dcd77cce4045c35bd77032 merge from firefox10: update to 10.0.1 diff -r fa6644729e7f -r 6e576750d898 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Feb 13 07:48:28 2012 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Feb 15 09:53:31 2012 +0100 @@ -18,7 +18,7 @@ %define major 10 -%define mainver %major.0.1 +%define mainver %major.0.1esr Name: MozillaFirefox BuildRequires: Mesa-devel diff -r fa6644729e7f -r 6e576750d898 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Mon Feb 13 07:48:28 2012 +0100 +++ b/MozillaFirefox/create-tar.sh Wed Feb 15 09:53:31 2012 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="release" +CHANNEL="esr10" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_10_0_1_RELEASE" -VERSION="10.0.1" +RELEASE_TAG="FIREFOX_10_0_1esr_RELEASE" +VERSION="10.0.1esr" # 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 fa6644729e7f -r 6e576750d898 xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Mon Feb 13 07:48:28 2012 +0100 +++ b/xulrunner/create-tar.sh Wed Feb 15 09:53:31 2012 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="release" +CHANNEL="esr10" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_10_0_1_RELEASE" -VERSION="10.0.1" +RELEASE_TAG="FIREFOX_10_0_1esr_RELEASE" +VERSION="10.0.1esr" # 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 fa6644729e7f -r 6e576750d898 xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Mon Feb 13 07:48:28 2012 +0100 +++ b/xulrunner/xulrunner.spec Wed Feb 15 09:53:31 2012 +0100 @@ -43,7 +43,7 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.8.9 BuildRequires: mozilla-nss-devel >= 3.13.1 -Version: 10.0.1 +Version: 10.0.1esr Release: 0 %define releasedate 2012020800 %define version_internal 10.0.1