# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1501938311 -7200
# Node ID 98c4a3711f11d10c40a836f32a03bbba6be28c59
# Parent  593707d5c013936561dfbd80bdb7b098d84e4d4c# Parent  87a20e4490e004c19e73e091cbfb7ec946856606
merge from firefox54

diff -r 87a20e4490e0 -r 98c4a3711f11 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Jul 17 12:02:05 2017 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Aug 05 15:05:11 2017 +0200
@@ -18,10 +18,10 @@
 
 # changed with every update
 %define major 54
-%define mainver %major.0.1
-%define update_channel release
+%define mainver %major.99
+%define update_channel beta
 %define branding 1
-%define releasedate 20170629000000
+%define releasedate 20170804000000
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
diff -r 87a20e4490e0 -r 98c4a3711f11 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Mon Jul 17 12:02:05 2017 +0200
+++ b/MozillaFirefox/create-tar.sh	Sat Aug 05 15:05:11 2017 +0200
@@ -5,10 +5,10 @@
 # "moz_source_stamp": "c1de04f39fa956cfce83f6065b0e709369215ed5"
 # http://ftp.mozilla.org/pub/firefox/candidates/48.0-candidates/build2/l10n_changesets.txt
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_54_0_1_RELEASE"
-VERSION="54.0.1"
+RELEASE_TAG="FIREFOX_55_0b13_RELEASE"
+VERSION="54.99"
 
 # mozilla
 if [ -d mozilla ]; then