merge from firefox53
authorWolfgang Rosenauer <wr@rosenauer.org>
Sun, 04 Jun 2017 09:56:53 +0200
changeset 978 214d22b0c31c
parent 959 453d34bf1834 (diff)
parent 977 224d8137f02c (current diff)
child 979 f82a374a310d
merge from firefox53
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/create-tar.sh
MozillaFirefox/mozilla-preferences.patch
mozilla-preferences.patch
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Jun 04 09:49:48 2017 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Jun 04 09:56:53 2017 +0200
@@ -19,10 +19,10 @@
 
 # changed with every update
 %define major 53
-%define mainver %major.0
-%define update_channel release
+%define mainver %major.99
+%define update_channel beta
 %define branding 1
-%define releasedate 20170414000000
+%define releasedate 20170602000000
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
--- a/MozillaFirefox/create-tar.sh	Sun Jun 04 09:49:48 2017 +0200
+++ b/MozillaFirefox/create-tar.sh	Sun Jun 04 09:56:53 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="d345b657d381ade5195f1521313ac651618f54a2"
-VERSION="53.0"
+RELEASE_TAG="FIREFOX_54_0b13_RELEASE"
+VERSION="53.99"
 
 # mozilla
 if [ -d mozilla ]; then