Mozilla Firefox

Merge lp:~micahg/firefox/firefox-3.7.head.daily-patch-rebase-20090911 into lp:~mozillateam/firefox/firefox-3.7.head.old

  1. firefox-3.7.head.daily-patch-rebase-20090911
  2. Merge into firefox-3.7.head.old
Proposed by Micah Gersten
Status: Merged
Approved by: Alexander Sack
Approved revision: 461
Merged at revision: not available
Proposed branch: lp:~micahg/firefox/firefox-3.7.head.daily-patch-rebase-20090911
Merge into: lp:~mozillateam/firefox/firefox-3.7.head.old
Diff against target: None lines
To merge this branch: bzr merge lp:~micahg/firefox/firefox-3.7.head.daily-patch-rebase-20090911
Reviewer Review Type Date Requested Status
Alexander Sack (community) Approve
Review via email: mp+11626@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote :

This branch has a patch rebase to fix the Firefox 3.7 daily build.

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

looks good. thanks.

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-09-11 02:59:32 +0000
+++ debian/changelog 2009-09-11 18:44:18 +0000
@@ -1,8 +1,8 @@
1firefox-3.7 (3.7~a1~hg20090910r32360+nobinonly-0ubuntu1) UNRELEASED; urgency=low1firefox-3.7 (3.7~a1~hg20090911r32412+nobinonly-0ubuntu1) UNRELEASED; urgency=low
22
3 * Mass update from 3.6 to 3.73 * Mass update from 3.6 to 3.7
44
5 -- Micah Gersten <launchpad@micahscomputing.com> Thu, 10 Sep 2009 10:42:30 -05005 -- Micah Gersten <launchpad@micahscomputing.com> Fri, 11 Sep 2009 13:30:38 -0500
66
7firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low7firefox-3.6 (3.6~a2~hg20090810r31291+nobinonly-0ubuntu1) UNRELEASED; urgency=low
88
99
=== modified file 'debian/patches/firefox-profilename'
--- debian/patches/firefox-profilename 2009-08-17 18:27:39 +0000
+++ debian/patches/firefox-profilename 2009-09-11 18:46:38 +0000
@@ -155,7 +155,7 @@
155 // .. etc ..155 // .. etc ..
156 //156 //
157 pref("extensions.update.enabled", true);157 pref("extensions.update.enabled", true);
158 pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%");158 pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%");
159 pref("extensions.update.interval", 86400); // Check for updates to Extensions and 159 pref("extensions.update.interval", 86400); // Check for updates to Extensions and
160 // Themes every day160 // Themes every day
161 // Non-symmetric (not shared by extensions) extension-specific [update] preferences161 // Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -173,7 +173,7 @@
173 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");173 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
174 174
175 pref("xpinstall.whitelist.add", "update.mozilla.org");175 pref("xpinstall.whitelist.add", "update.mozilla.org");
176@@ -831,17 +831,17 @@176@@ -832,17 +832,17 @@
177 177
178 // replace newlines with spaces when pasting into <input type="text"> fields178 // replace newlines with spaces when pasting into <input type="text"> fields
179 pref("editor.singleLine.pasteNewlines", 2);179 pref("editor.singleLine.pasteNewlines", 2);

Subscribers

People subscribed via source and target branches