Merge lp:~ddecator/firefox/fix-firefox-daily-build-20100625 into lp:~mozillateam/firefox/firefox-4.0.head.branch_format7

[Draycen DeCator]

Rebased patches

[Micah Gersten (micahg)]

Please try this when refreshing patches:
quilt refresh --diffstat -U8 --no-timestamps

That will minimize the diff.

[Micah Gersten (micahg)]

review: Needs Fixing

[lp:~ddecator/firefox/fix-firefox-daily-build-20100625]

544. By Draycen DeCator on 2010-06-26

* New upstream snapshot 3.7 a6 HG 20100626r46261

545. By Draycen DeCator on 2010-06-26

* Rebase patches
  - update debian/patches/awesome_browser_branding_install.patch
  - update debian/patches/browser_branding.patch

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-20 05:53:09 +0000
+++ debian/changelog	2010-06-26 02:10:45 +0000
@@ -1,4 +1,4 @@
-firefox-3.7 (3.7~a6~hg20100620r43871+nobinonly-0ubuntu1) UNRELEASED; urgency=low
+firefox-3.7 (3.7~a6~hg20100626r46261+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 
   [ Fabien Tassin <[e-mail]> ]
   * Mass update from 3.6 to 3.7
@@ -68,7 +68,7 @@
   * Refresh diverged patch
     - update debian/patches/ubuntu_bookmarks.patch
 
- -- Draycen DeCator <[e-mail]>  Sun, 20 Jun 2010 01:37:36 -0400
+ -- Draycen DeCator <[e-mail]>  Fri, 25 Jun 2010 21:43:18 -0400
 
 firefox-3.7 (3.7~a2~hg20100212r38093+nobinonly-0ubuntu1) UNRELEASED; urgency=low
 
 
=== modified file 'debian/patches/awesome_browser_branding_install.patch'
--- debian/patches/awesome_browser_branding_install.patch	2009-09-11 01:55:33 +0000
+++ debian/patches/awesome_browser_branding_install.patch	2010-06-26 02:10:45 +0000
@@ -6,11 +6,11 @@
 ===================================================================
 --- mozilla.orig/browser/installer/package-manifest.in
 +++ mozilla/browser/installer/package-manifest.in
-@@ -358,16 +358,22 @@
- @BINPATH@/chrome/browser.manifest
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@@ -366,16 +366,22 @@
  @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+ #if MOZ_UPDATE_CHANNEL == beta
+ @BINPATH@/extensions/[e-mail]/*
+ #endif
  @BINPATH@/chrome/toolkit.jar
  @BINPATH@/chrome/toolkit.manifest
  @BINPATH@/@PREF_DIR@/reporter.js
 
=== modified file 'debian/patches/browser_branding.patch'
--- debian/patches/browser_branding.patch	2010-06-10 03:14:28 +0000
+++ debian/patches/browser_branding.patch	2010-06-26 02:10:45 +0000
@@ -39,11 +39,11 @@
 ===================================================================
 --- mozilla.orig/browser/installer/package-manifest.in
 +++ mozilla/browser/installer/package-manifest.in
-@@ -353,16 +353,22 @@
- @BINPATH@/chrome/browser.manifest
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@@ -366,16 +366,22 @@
  @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+ #if MOZ_UPDATE_CHANNEL == beta
+ @BINPATH@/extensions/[e-mail]/*
+ #endif
  @BINPATH@/chrome/toolkit.jar
  @BINPATH@/chrome/toolkit.manifest
  @BINPATH@/@PREF_DIR@/reporter.js
@@ -53,7 +53,7 @@
 +@BINPATH@/chrome/browser-branding.manifest
 +@BINPATH@/chrome/browser-branding-en-US.jar
 +@BINPATH@/chrome/browser-branding-en-US.manifest
-+ 
++
  ; ubuntu awesome browser branding
  @BINPATH@/chrome/awesome-branding.jar
  @BINPATH@/chrome/awesome-branding.manifest