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.
update to use release branch
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 26 Oct 2010 13:25:34 +0200
changeset 186 c784e9d84c5c
parent 185 c03de6258fea
child 187 569c12e2aff9
update to use release branch
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
firefox-sync-build.patch file | annotate | diff | comparison | revisions
mozilla-xulrunner20/create-tar.sh file | annotate | diff | comparison | revisions
mozilla-xulrunner20/mozilla-xulrunner20.spec file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Oct 25 13:06:20 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Oct 26 13:25:34 2010 +0200
@@ -36,7 +36,7 @@
 Provides:       firefox
 Version:        4.0b
 Release:        1
-%define         releasedate 2010100400
+%define         releasedate 2010101200
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -385,8 +385,8 @@
 %dir %{progdir}/extensions/
 %endif
 
-%files branding-upstream  
-%defattr(-,root,root)  
+%files branding-upstream
+%defattr(-,root,root)
 %dir %{progdir}
 %dir %{progdir}/defaults/
 %{progdir}/defaults/profile/bookmarks.html
--- a/firefox-sync-build.patch	Mon Oct 25 13:06:20 2010 +0200
+++ b/firefox-sync-build.patch	Tue Oct 26 13:25:34 2010 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 686f29d9e7e6ef165400bec2eea04aa861b83ec5
+# Parent 20a161dabb40729976748bf5b13d14f27b76b130
 Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk
 
 diff --git a/browser/build.mk b/browser/build.mk
@@ -21,12 +21,12 @@
 +
  tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
  
+ tier_app_dirs += toolkit/components/console/hudservice
+ 
  tier_app_dirs += browser
  
  installer:
  	@$(MAKE) -C browser/installer installer
- 
- package:
 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
 --- a/toolkit/toolkit-tiers.mk
 +++ b/toolkit/toolkit-tiers.mk
--- a/mozilla-xulrunner20/create-tar.sh	Mon Oct 25 13:06:20 2010 +0200
+++ b/mozilla-xulrunner20/create-tar.sh	Tue Oct 26 13:25:34 2010 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 BRANCH="mozilla-central"
-RELEASE_TAG="default"
+RELEASE_TAG="GECKO20b7pre_20101006_RELBRANCH"
 VERSION="2.0b"
 
 # mozilla
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec	Mon Oct 25 13:06:20 2010 +0200
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec	Tue Oct 26 13:25:34 2010 +0200
@@ -32,7 +32,7 @@
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
 Version:        2.0b
 Release:        1
-%define         releasedate 2010100400
+%define         releasedate 2010101200
 %define         version_internal 2.0b7pre
 %define         apiversion 2.0
 %define         uaweight 199900
mozilla