Mozilla Firefox

Merge lp:~micahg/firefox/firefox-3.6-20091018 into lp:firefox/3.6

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

Built fine in my PPA:
https://edge.launchpad.net/~micahg/+archive/mozilla-test/+packages

Simple rebase

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

thx

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-17 19:36:07 +0000
+++ debian/changelog 2009-10-19 02:10:21 +0000
@@ -1,4 +1,4 @@
1firefox-3.6 (3.6~b1~hg20091008r32386+nobinonly-0ubuntu1) UNRELEASED; urgency=low1firefox-3.6 (3.6~b2~hg20091018r32552+nobinonly-0ubuntu1) UNRELEASED; urgency=low
22
3 [ H. Montoliu <hmontoliu@ubuntu.com> ]3 [ H. Montoliu <hmontoliu@ubuntu.com> ]
4 * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file4 * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file
@@ -139,7 +139,7 @@
139 - update debian/patches/browser_branding.patch139 - update debian/patches/browser_branding.patch
140 - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch140 - update debian/patches/bzXXX_moz_app_name_inconsistencies.patch
141141
142 -- Micah Gersten <launchpad@micahscomputing.com> Thu, 08 Oct 2009 23:40:03 -0500142 -- Micah Gersten <launchpad@micahscomputing.com> Sun, 18 Oct 2009 20:41:38 -0500
143143
144firefox-3.1 (3.1~b3~hg20081221r22451+nobinonly-0ubuntu1) UNRELEASED; urgency=low144firefox-3.1 (3.1~b3~hg20081221r22451+nobinonly-0ubuntu1) UNRELEASED; urgency=low
145145
146146
=== modified file 'debian/patches/firefox-profilename'
--- debian/patches/firefox-profilename 2009-09-16 05:59:07 +0000
+++ debian/patches/firefox-profilename 2009-10-19 02:10:21 +0000
@@ -150,12 +150,12 @@
150 // blocking them.150 // blocking them.
151 pref("extensions.blocklist.level", 2);151 pref("extensions.blocklist.level", 2);
152 pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");152 pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
153@@ -156,19 +156,19 @@153@@ -160,19 +160,19 @@
154 // extensions.{GUID}.update.interval154 // extensions.{GUID}.update.url
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
@@ -172,8 +172,8 @@
172 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");172 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");
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", "addons.mozilla.org");
176@@ -832,17 +832,17 @@176@@ -840,17 +840,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