Mozilla Firefox

Merge lp:~micahg/firefox/firefox-3.7-20091006 into lp:~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:~micahg/firefox/firefox-3.7-20091006
Merge into: lp:~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:~micahg/firefox/firefox-3.7-20091006
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+12967@code.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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-10-03 12:26:16 +0000
3+++ debian/changelog 2009-10-07 06:10:25 +0000
4@@ -1,11 +1,11 @@
5-firefox-3.7 (3.7~a1~hg20091002r33386+nobinonly-0ubuntu1) UNRELEASED; urgency=low
6+firefox-3.7 (3.7~a1~hg20091006r33504+nobinonly-0ubuntu1) UNRELEASED; urgency=low
7
8 * Mass update from 3.6 to 3.7
9 * Drop libnkgnomevfs.so from firefox-3.7-gnome-support, it's already
10 shippped in xulrunner-1.9.3-gnome-support (see bmo #512671)
11 - update debian/firefox-3.7-gnome-support.install
12
13- -- Fabien Tassin <fta@ubuntu.com> Fri, 02 Oct 2009 17:09:23 +0200
14+ -- Micah Gersten <launchpad@micahscomputing.com> Tue, 06 Oct 2009 16:13:14 -0500
15
16 firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
17
18
19=== modified file 'debian/patches/bz460917_att350845_reload_new_plugins.patch'
20--- debian/patches/bz460917_att350845_reload_new_plugins.patch 2009-10-03 12:53:49 +0000
21+++ debian/patches/bz460917_att350845_reload_new_plugins.patch 2009-10-07 06:10:25 +0000
22@@ -6,7 +6,7 @@
23 ===================================================================
24 --- mozilla.orig/browser/base/content/browser.js
25 +++ mozilla/browser/base/content/browser.js
26-@@ -5869,22 +5869,30 @@
27+@@ -5892,22 +5892,30 @@
28 }
29
30 missingPluginInstaller.prototype.installSinglePlugin = function(aEvent){
31@@ -37,12 +37,12 @@
32 aEvent.stopPropagation();
33 }
34
35-@@ -5950,21 +5958,27 @@
36- var url = formatter.formatURLPref("plugins.update.url");
37+@@ -5967,21 +5975,27 @@
38+ var url = formatURL("plugins.update.url", true);
39 gBrowser.loadOneTab(url, {inBackground: false});
40 return true;
41 }
42-
43+
44 function showPluginsMissing() {
45 // get the urls of missing plugins
46 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
47@@ -65,7 +65,7 @@
48
49 let iconURL = "chrome://mozapps/skin/plugins/pluginBlocked-16.png";
50 let messageString = gNavigatorBundle.getString("blockedpluginsMessage.title");
51-@@ -6043,16 +6057,23 @@
52+@@ -6060,16 +6074,23 @@
53
54 // clear the plugin list, now that at least one plugin has been installed
55 browser.missingPlugins = null;

Subscribers

People subscribed via source and target branches