Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from firefox39 and switch to 40beta branch
authorWolfgang Rosenauer <wr@rosenauer.org>
Sat, 18 Jul 2015 14:48:41 +0200
changeset 867 3af93b7e5e3d
parent 862 390088186660 (diff)
parent 866 28eb9d3ab7e8 (current diff)
child 868 284da266ec46
child 879 3b986c9dbc5f
merge from firefox39 and switch to 40beta branch
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/create-tar.sh file | annotate | diff | comparison | revisions 
--- 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)
--- 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"
--- 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
mozilla