← Back to branch summary

~oem-solutions-group/firefox/firefox-3.0.dennis

« back to all changes in this revision

Viewing changes to debian/patches/firefox-profilename

  • Committer: Nicolas Valcarcel Scerpella
  • Date: 2010-06-30 19:15:40 UTC
  • Revision ID: nvalcarcel@canonical.com-20100630191540-siqaxe8ab11kn4dx
reverted for re-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/firefox-profilename
1
 
---
2
 
 browser/app/application.ini                               |    2 -
3
 
 browser/app/profile/firefox.js                            |   22 +++++++-------
4
 
 browser/branding/awesome-browser/pref/firefox-branding.js |   10 +++---
5
 
 browser/branding/nightly/pref/firefox-branding.js         |   10 +++---
6
 
 browser/branding/unofficial/pref/firefox-branding.js      |   10 +++---
7
 
 other-licenses/branding/firefox/pref/firefox-branding.js  |    8 ++---
8
 
 6 files changed, 31 insertions(+), 31 deletions(-)
9
 
 
10
 
Index: mozilla/browser/app/application.ini
11
 
===================================================================
12
 
--- mozilla.orig/browser/app/application.ini
13
 
+++ mozilla/browser/app/application.ini
14
 
@@ -33,17 +33,17 @@
15
 
 ; the provisions above, a recipient may use your version of this file under
16
 
 ; the terms of any one of the MPL, the GPL or the LGPL.
17
 
 ;
18
 
 ; ***** END LICENSE BLOCK *****
19
 
 
20
 
 #filter substitution
21
 
 [App]
22
 
 Vendor=Mozilla
23
 
-Name=Firefox
24
 
+Name=Firefox-3.6
25
 
 Version=@APP_VERSION@
26
 
 BuildID=@GRE_BUILDID@
27
 
 #ifdef MOZ_SOURCE_REPO
28
 
 SourceRepository=@MOZ_SOURCE_REPO@
29
 
 #endif
30
 
 #ifdef MOZ_SOURCE_STAMP
31
 
 SourceStamp=@MOZ_SOURCE_STAMP@
32
 
 #endif
33
 
Index: mozilla/browser/branding/unofficial/pref/firefox-branding.js
34
 
===================================================================
35
 
--- mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js
36
 
+++ mozilla/browser/branding/unofficial/pref/firefox-branding.js
37
 
@@ -1,22 +1,22 @@
38
 
-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
39
 
-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
40
 
+pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/");
41
 
+pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
42
 
 // The time interval between checks for a new version (in seconds)
43
 
 // nightly=8 hours, official=24 hours
44
 
 pref("app.update.interval", 28800);
45
 
 // The time interval between the downloading of mar file chunks in the
46
 
 // background (in seconds)
47
 
 pref("app.update.download.backgroundInterval", 60);
48
 
 // URL user can browse to manually if for some reason all update installation
49
 
 // attempts fail.
50
 
-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
51
 
+pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
52
 
 // A default value for the "More information about this update" link
53
 
 // supplied in the "An update is available" page of the update wizard. 
54
 
-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
55
 
+pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
56
 
 
57
 
 // Release notes URL
58
 
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
59
 
+pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");
60
 
 
61
 
 // Search codes belong only in builds with official branding
62
 
 pref("browser.search.param.yahoo-fr", "");
63
 
 pref("browser.search.param.yahoo-fr-cjkt", "");
64
 
 pref("browser.search.param.yahoo-f-CN", "");
65
 
Index: mozilla/browser/branding/awesome-browser/pref/firefox-branding.js
66
 
===================================================================
67
 
--- mozilla.orig/browser/branding/awesome-browser/pref/firefox-branding.js
68
 
+++ mozilla/browser/branding/awesome-browser/pref/firefox-branding.js
69
 
@@ -1,16 +1,16 @@
70
 
-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
71
 
-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
72
 
+pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/");
73
 
+pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
74
 
 // URL user can browse to manually if for some reason all update installation
75
 
 // attempts fail.
76
 
-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
77
 
+pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
78
 
 // A default value for the "More information about this update" link
79
 
 // supplied in the "An update is available" page of the update wizard. 
80
 
-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
81
 
+pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
82
 
 
83
 
 // Release notes URL
84
 
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
85
 
+pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");
86
 
 
87
 
 // Search codes belong only in builds with official branding
88
 
 pref("browser.search.param.yahoo-fr", "");
89
 
 pref("browser.search.param.yahoo-fr-cjkt", "");
90
 
 pref("browser.search.param.yahoo-f-CN", "");
91
 
Index: mozilla/other-licenses/branding/firefox/pref/firefox-branding.js
92
 
===================================================================
93
 
--- mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js
94
 
+++ mozilla/other-licenses/branding/firefox/pref/firefox-branding.js
95
 
@@ -1,20 +1,20 @@
96
 
-pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
97
 
-pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
98
 
+pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/");
99
 
+pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
100
 
 // Interval: Time between checks for a new version (in seconds)
101
 
 // nightly=6 hours, official=24 hours
102
 
 pref("app.update.interval", 86400);
103
 
 // The time interval between the downloading of mar file chunks in the
104
 
 // background (in seconds)
105
 
 pref("app.update.download.backgroundInterval", 600);
106
 
 // URL user can browse to manually if for some reason all update installation
107
 
 // attempts fail.
108
 
 pref("app.update.url.manual", "http://www.firefox.com");
109
 
 // A default value for the "More information about this update" link
110
 
 // supplied in the "An update is available" page of the update wizard. 
111
 
-pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/%APP%/releases/");
112
 
+pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/firefox/releases/");
113
 
 
114
 
 // Release notes URL
115
 
-pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
116
 
+pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");
117
 
 
118
 
 pref("browser.search.param.yahoo-fr", "moz35");
119
 
 pref("browser.search.param.yahoo-fr-cjkt", "moz35");
120
 
Index: mozilla/browser/app/profile/firefox.js
121
 
===================================================================
122
 
--- mozilla.orig/browser/app/profile/firefox.js
123
 
+++ mozilla/browser/app/profile/firefox.js
124
 
@@ -65,34 +65,34 @@
125
 
 pref("extensions.ignoreMTimeChanges", false);
126
 
 // Enables some extra Extension System Logging (can reduce performance)
127
 
 pref("extensions.logging.enabled", false);
128
 
 // Hides the install button in the add-ons mgr
129
 
 pref("extensions.hideInstallButton", true);
130
 
 
131
 
 // Preferences for the Get Add-ons pane
132
 
 pref("extensions.getAddons.showPane", true);
133
 
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
134
 
+pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/firefox");
135
 
 pref("extensions.getAddons.maxResults", 5);
136
 
-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
137
 
-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
138
 
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
139
 
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
140
 
+pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/recommended");
141
 
+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
142
 
+pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
143
 
+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
144
 
 
145
 
 // Blocklist preferences
146
 
 pref("extensions.blocklist.enabled", true);
147
 
 pref("extensions.blocklist.interval", 86400);
148
 
 // Controls what level the blocklist switches from warning about items to forcibly
149
 
 // blocking them.
150
 
 pref("extensions.blocklist.level", 2);
151
 
 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.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
153
 
 
154
 
 // Dictionary download preference
155
 
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
156
 
+pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
157
 
 
158
 
 // Update Timer Manager preferences
159
 
 // Interval: When all registered timers should be checked (in milliseconds)
160
 
 //           default=10 minutes
161
 
 pref("app.update.timer", 600000);
162
 
 
163
 
 // App-specific update preferences
164
 
 
165
 
@@ -160,17 +160,17 @@
166
 
 //  extensions.{GUID}.update.url
167
 
 //  .. etc ..
168
 
 //
169
 
 pref("extensions.update.enabled", true);
170
 
 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%");
171
 
 pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
172
 
                                             // Themes every day
173
 
 // Non-symmetric (not shared by extensions) extension-specific [update] preferences
174
 
-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/getpersonas");
175
 
+pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
176
 
 pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
177
 
 pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
178
 
                                                 // restart.
179
 
 
180
 
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties");
181
 
 pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
182
 
 
183
 
 pref("xpinstall.whitelist.add", "addons.mozilla.org");
184
 
@@ -274,17 +274,17 @@
185
 
 pref("browser.download.manager.focusWhenStarting", false);
186
 
 pref("browser.download.manager.flashCount", 2);
187
 
 pref("browser.download.manager.addToRecentDocs", true);
188
 
 pref("browser.download.manager.quitBehavior", 0);
189
 
 pref("browser.download.manager.scanWhenDone", true);
190
 
 pref("browser.download.manager.resumeOnWakeDelay", 10000);
191
 
 
192
 
 // search engines URL
193
 
-pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/");
194
 
+pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
195
 
 
196
 
 // pointer to the default engine name
197
 
 pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
198
 
 
199
 
 // disable logging for the search service by default
200
 
 pref("browser.search.log", false);
201
 
 
202
 
 // Ordering of Search Engines in the Engine list. 
203
 
@@ -707,18 +707,18 @@
204
 
 // HTML report pages
205
 
 pref("browser.safebrowsing.provider.0.reportGenericURL", "http://{moz:locale}.phish-generic.mozilla.com/?hl={moz:locale}");
206
 
 pref("browser.safebrowsing.provider.0.reportErrorURL", "http://{moz:locale}.phish-error.mozilla.com/?hl={moz:locale}");
207
 
 pref("browser.safebrowsing.provider.0.reportPhishURL", "http://{moz:locale}.phish-report.mozilla.com/?hl={moz:locale}");
208
 
 pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}");
209
 
 pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
210
 
 
211
 
 // FAQ URLs
212
 
-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/phishing-protection/");
213
 
-pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/geolocation/");
214
 
+pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
215
 
+pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/");
216
 
 
217
 
 // Name of the about: page contributed by safebrowsing to handle display of error
218
 
 // pages on phishing/malware hits.  (bug 399233)
219
 
 pref("urlclassifier.alternate_error_page", "blocked");
220
 
 
221
 
 // The number of random entries to send with a gethash request.
222
 
 pref("urlclassifier.gethashnoise", 4);
223
 
 
224
 
@@ -843,17 +843,17 @@
225
 
 
226
 
 // replace newlines with spaces when pasting into <input type="text"> fields
227
 
 pref("editor.singleLine.pasteNewlines", 2);
228
 
 
229
 
 // The breakpad report server to link to in about:crashes
230
 
 pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
231
 
 
232
 
 // base URL for web-based support pages
233
 
-pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/");
234
 
+pref("app.support.baseURL", "http://support.mozilla.com/1/firefox/%VERSION%/%OS%/%LOCALE%/");
235
 
 
236
 
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
237
 
 pref("security.alternate_certificate_error_page", "certerror");
238
 
 
239
 
 // Whether to start the private browsing mode at application startup
240
 
 pref("browser.privatebrowsing.autostart", false);
241
 
 
242
 
 // Whether we should skip prompting before starting the private browsing mode
243
 
Index: mozilla/browser/branding/nightly/pref/firefox-branding.js
244
 
===================================================================
245
 
--- mozilla.orig/browser/branding/nightly/pref/firefox-branding.js
246
 
+++ mozilla/browser/branding/nightly/pref/firefox-branding.js
247
 
@@ -1,22 +1,22 @@
248
 
-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
249
 
-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
250
 
+pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/");
251
 
+pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
252
 
 // The time interval between checks for a new version (in seconds)
253
 
 // nightly=8 hours, official=24 hours
254
 
 pref("app.update.interval", 28800);
255
 
 // The time interval between the downloading of mar file chunks in the
256
 
 // background (in seconds)
257
 
 pref("app.update.download.backgroundInterval", 60);
258
 
 // URL user can browse to manually if for some reason all update installation
259
 
 // attempts fail.
260
 
-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
261
 
+pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
262
 
 // A default value for the "More information about this update" link
263
 
 // supplied in the "An update is available" page of the update wizard. 
264
 
-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
265
 
+pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
266
 
 
267
 
 // Release notes URL
268
 
-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
269
 
+pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/firefox/%VERSION%/releasenotes/");
270
 
 
271
 
 // Search codes belong only in builds with official branding
272
 
 pref("browser.search.param.yahoo-fr", "");
273
 
 pref("browser.search.param.yahoo-fr-cjkt", "");
274
 
 pref("browser.search.param.yahoo-f-CN", "");