Mozilla Firefox

Merge lp://qastaging/~micahg/firefox/firefox-3.7-20091006 into lp://qastaging/~mozillateam/firefox/firefox-3.7.head.old

  1. firefox-3.7-20091006
  2. Merge into firefox-3.7.head.old
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~micahg/firefox/firefox-3.7-20091006
Merge into: lp://qastaging/~mozillateam/firefox/firefox-3.7.head.old
Diff against target: 55 lines
2 files modified
debian/changelog (+2/-2)
debian/patches/bz460917_att350845_reload_new_plugins.patch (+5/-5)
To merge this branch: bzr merge lp://qastaging/~micahg/firefox/firefox-3.7-20091006
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+12967@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

Fix FTBFS for dailies

Revision history for this message
Alexander Sack (asac) wrote :

thx. pulling to .head branch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-10-03 12:26:16 +0000
+++ debian/changelog 2009-10-07 06:10:25 +0000
@@ -1,11 +1,11 @@
1firefox-3.7 (3.7~a1~hg20091002r33386+nobinonly-0ubuntu1) UNRELEASED; urgency=low1firefox-3.7 (3.7~a1~hg20091006r33504+nobinonly-0ubuntu1) UNRELEASED; urgency=low
22
3 * Mass update from 3.6 to 3.73 * Mass update from 3.6 to 3.7
4 * Drop libnkgnomevfs.so from firefox-3.7-gnome-support, it's already4 * Drop libnkgnomevfs.so from firefox-3.7-gnome-support, it's already
5 shippped in xulrunner-1.9.3-gnome-support (see bmo #512671)5 shippped in xulrunner-1.9.3-gnome-support (see bmo #512671)
6 - update debian/firefox-3.7-gnome-support.install6 - update debian/firefox-3.7-gnome-support.install
77
8 -- Fabien Tassin <fta@ubuntu.com> Fri, 02 Oct 2009 17:09:23 +02008 -- Micah Gersten <launchpad@micahscomputing.com> Tue, 06 Oct 2009 16:13:14 -0500
99
10firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low10firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
1111
1212
=== modified file 'debian/patches/bz460917_att350845_reload_new_plugins.patch'
--- debian/patches/bz460917_att350845_reload_new_plugins.patch 2009-10-03 12:53:49 +0000
+++ debian/patches/bz460917_att350845_reload_new_plugins.patch 2009-10-07 06:10:25 +0000
@@ -6,7 +6,7 @@
6===================================================================6===================================================================
7--- mozilla.orig/browser/base/content/browser.js7--- mozilla.orig/browser/base/content/browser.js
8+++ mozilla/browser/base/content/browser.js8+++ mozilla/browser/base/content/browser.js
9@@ -5869,22 +5869,30 @@9@@ -5892,22 +5892,30 @@
10 }10 }
11 11
12 missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){12 missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){
@@ -37,12 +37,12 @@
37 aEvent.stopPropagation();37 aEvent.stopPropagation();
38 }38 }
39 39
40@@ -5950,21 +5958,27 @@40@@ -5967,21 +5975,27 @@
41 var url = formatter.formatURLPref("plugins.update.url");41 var url = formatURL("plugins.update.url", true);
42 gBrowser.loadOneTab(url, {inBackground: false});42 gBrowser.loadOneTab(url, {inBackground: false});
43 return true;43 return true;
44 }44 }
45 45
46 function showPluginsMissing() {46 function showPluginsMissing() {
47 // get the urls of missing plugins47 // get the urls of missing plugins
48 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;48 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
@@ -65,7 +65,7 @@
65 65
66 let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";66 let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";
67 let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");67 let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");
68@@ -6043,16 +6057,23 @@68@@ -6060,16 +6074,23 @@
69 69
70 // clear the plugin list, now that at least one plugin has been installed70 // clear the plugin list, now that at least one plugin has been installed
71 browser.missingPlugins = null;71 browser.missingPlugins = null;

Subscribers

People subscribed via source and target branches