# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1437223721 -7200
# Node ID 3af93b7e5e3dd1eff3603d64a8fa4342b2ab996e
# Parent  390088186660745dde7caa0b12d9e867425a20be# Parent  28eb9d3ab7e8f7d8c102fa87d80f2829b56bf416
merge from firefox39 and switch to 40beta branch

diff -r 28eb9d3ab7e8 -r 3af93b7e5e3d MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Jul 18 14:44:33 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Jul 18 14:48:41 2015 +0200
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Sat Jul 18 12:47:47 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 40.0b5
+
+-------------------------------------------------------------------
 Wed Jul  1 06:43:02 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 39.0 (bnc#935979)
diff -r 28eb9d3ab7e8 -r 3af93b7e5e3d MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Jul 18 14:44:33 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Jul 18 14:48:41 2015 +0200
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 39
-%define mainver %major.0
-%define update_channel release
-%define releasedate 2015063000
+%define mainver %major.99
+%define update_channel beta
+%define releasedate 2015071700
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
diff -r 28eb9d3ab7e8 -r 3af93b7e5e3d MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Sat Jul 18 14:44:33 2015 +0200
+++ b/MozillaFirefox/create-tar.sh	Sat Jul 18 14:48:41 2015 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_39_0_RELEASE"
-VERSION="39.0"
+RELEASE_TAG="FIREFOX_40_0b5_RELEASE"
+VERSION="39.99"
 
 # mozilla
 if [ -d mozilla ]; then