Mozilla Firefox

Merge lp:~hmontoliu/firefox/firefox-3.0.head into lp:firefox/3.5

  1. firefox-3.0.head
  2. Merge into firefox-3.5.head
Proposed by Hilario J. Montoliu (hjmf)
Status: Rejected
Rejected by: Alexander Sack
Proposed branch: lp:~hmontoliu/firefox/firefox-3.0.head
Merge into: lp:firefox/3.5
Diff against target: None lines
To merge this branch: bzr merge lp:~hmontoliu/firefox/firefox-3.0.head
Reviewer Review Type Date Requested Status
Alexander Sack (community) Disapprove
Review via email: mp+5543@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hilario J. Montoliu (hjmf) (hmontoliu) wrote :

fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file

lp:~hmontoliu/firefox/firefox-3.0.head updated
395. By Hilario J. Montoliu (hjmf)

* debian/apport/firefox-3.0.py - removed unused code and minor refactoring.

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

you submitted firefox-3.0.head for merge into firefox-3.1.head ;) ...

review: Disapprove

Unmerged revisions

395. By Hilario J. Montoliu (hjmf)

* debian/apport/firefox-3.0.py - removed unused code and minor refactoring.

394. By Hilario J. Montoliu (hjmf)

fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file

393. By Alexander Sack

* fix LP: #359382 - "Ubuntu Wiki" default bookmark does not point to
  the wiki home page; we use http://wiki.ubuntu.com now
  - update debian/patches/ubuntu_bookmarks.html

392. By Alexander Sack

* open new changelog for post-jaunty

391. By Alexander Sack

* RELEASE 3.0.8+nobinonly-0ubuntu3 to ubuntu/jaunty

390. By Alexander Sack

* drop google code again
  - remove debian/patches/google_code.patch
  - update debian/patches/series

389. By Alexander Sack

RELEASE 3.0.8+nobinonly-0ubuntu2 to ubuntu/jaunty
* security/stability v3.0.8 (FIREFOX_3_0_8_RELEASE)
  - see USN-745-1

388. By Alexander Sack

RELEASE 3.0.7+nobinonly-0ubuntu2 to ubuntu/jaunty
* update client code for google searchplugin
  - add debian/patches/google_code.patch
  - update debian/patches/series

387. By Alexander Sack

* RELEASE 3.0.7+nobinonly-0ubuntu1 to ubuntu/jaunty

386. By Alexander Sack

* security/stability v3.0.7 (FIREFOX_3_0_7_RELEASE)
  - USN-728-1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apport/firefox-3.0.py'
2--- debian/apport/firefox-3.0.py 2008-05-13 08:55:19 +0000
3+++ debian/apport/firefox-3.0.py 2009-04-14 21:51:53 +0000
4@@ -88,10 +88,6 @@
5 config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox')
6
7 # append pluginreg.dat file:
8- pluginreg_dat = os.path.join(config_dir,'pluginreg.dat')
9- if os.path.exists(pluginreg_dat):
10- report['pluginreg.dat'] = open(pluginreg_dat).read()
11-
12 # append profiles.ini file & parse it:
13 profiles_ini = os.path.join(config_dir,'profiles.ini')
14 if os.path.exists(profiles_ini):
15@@ -109,10 +105,18 @@
16 profiles_d[profile_parser.get(section, 'Name')] = (os.path.join(config_dir, profile_parser.get(section, 'Path')), is_default)
17
18 # summarize the extensions loaded on each profile (either global and local):
19+ # also append the pluginreg.dat file of the default profile (maybe in a
20+ # future append each profile's pluginreg.dat file)
21 extensions_dict, themes_dict, extension_summary = {}, {}, ''
22 for profile_name in profiles_d.keys():
23 profile_path, is_default = profiles_d[profile_name]
24 extensions_ini = os.path.join(profile_path, 'extensions.ini')
25+ pluginreg_dat = os.path.join(profile_path, 'pluginreg.dat')
26+ if os.path.exists(pluginreg_dat):
27+ if is_default == '1':
28+ report['default_profile_pluginreg.dat'] = open(pluginreg_dat).read()
29+ else:
30+ report['profile_%s_pluginreg.dat' % profile_name] = open(pluginreg_dat).read()
31 if os.path.exists(extensions_ini):
32 # attach each profile's extensions.ini too (not enabled).
33 #report['extensions.ini (profile: %s)' % profile_name ] = open(extensions_ini).read()
34
35=== modified file 'debian/changelog'
36--- debian/changelog 2008-11-26 20:58:10 +0000
37+++ debian/changelog 2009-04-14 21:51:53 +0000
38@@ -1,10 +1,77 @@
39-firefox-3.0 (3.0.4+nobinonly-0ubuntu3) UNRELEASED; urgency=low
40+firefox-3.0 (3.0.8+nobinonly-0ubuntu4) UNRELEASED; urgency=low
41+
42+ * fix LP: #361052 - firefox apport hook fails to retrieve pluginreg.dat file
43+
44+ -- H. Montoliu <hmontoliu@ubuntu.com> Tue Apr 14 21:50:44 UTC 2009
45+
46+firefox-3.0 (3.0.8+nobinonly-0ubuntu4) UNRELEASED; urgency=low
47+
48+ * fix LP: #359382 - "Ubuntu Wiki" default bookmark does not point to
49+ the wiki home page; we use http://wiki.ubuntu.com now
50+ - update debian/patches/ubuntu_bookmarks.html
51+
52+ -- Alexander Sack <asac@ubuntu.com> Tue, 14 Apr 2009 19:04:41 +0200
53+
54+firefox-3.0 (3.0.8+nobinonly-0ubuntu3) jaunty; urgency=low
55+
56+ * drop google code again
57+ - remove debian/patches/google_code.patch
58+ - update debian/patches/series
59+
60+ -- Alexander Sack <asac@ubuntu.com> Tue, 07 Apr 2009 10:58:55 +0200
61+
62+firefox-3.0 (3.0.8+nobinonly-0ubuntu2) jaunty; urgency=low
63+
64+ * security/stability v3.0.8 (FIREFOX_3_0_8_RELEASE)
65+ - see USN-745-1
66+
67+ -- Alexander Sack <asac@ubuntu.com> Fri, 27 Mar 2009 10:51:07 +0100
68+
69+firefox-3.0 (3.0.7+nobinonly-0ubuntu2) jaunty; urgency=low
70+
71+ * update client code for google searchplugin
72+ - add debian/patches/google_code.patch
73+ - update debian/patches/series
74+
75+ -- Alexander Sack <asac@ubuntu.com> Tue, 24 Mar 2009 17:45:46 +0100
76+
77+firefox-3.0 (3.0.7+nobinonly-0ubuntu1) jaunty; urgency=low
78+
79+ * security/stability v3.0.7 (FIREFOX_3_0_7_RELEASE)
80+ - USN-728-1
81+
82+ -- Alexander Sack <asac@ubuntu.com> Thu, 05 Mar 2009 17:20:33 +0100
83+
84+firefox-3.0 (3.0.6+nobinonly-0ubuntu1) jaunty; urgency=low
85+
86+ * security/stability v3.0.6 (FIREFOX_3_0_6_RELEASE)
87+ - USN-717-1
88+
89+ -- Alexander Sack <asac@ubuntu.com> Thu, 05 Feb 2009 09:21:16 +0100
90+
91+firefox-3.0 (3.0.5+nobinonly-0ubuntu1) jaunty; urgency=low
92+
93+ New upstream security/stability update (v3.0.5 aka FIREFOX_3_0_5_RELEASE)
94+ - see USN-690-1
95
96 [ Nick Ellery <nick.ellery@ubuntu.com> ]
97 * fix LP: #270477 - firefox-3.0-branding has errors in it's package description
98 - update debian/control
99
100- -- Alexander Sack <asac@ubuntu.com> Wed, 26 Nov 2008 21:56:44 +0100
101+ [ Alexander Sack <asac@ubuntu.com> ]
102+ * do not install DEBIAN_NAME_OTHER chrome in binary-install/$(DEBIAN_NAME)::
103+ target.
104+ - update debian/rules
105+ * fix LP: #271524 - Firefox/Abrowser recommend ubufox; we demote ubufox to
106+ Suggests in order to prevent gnome stuff from being installed on kde
107+ systems
108+ - update debian/control
109+ * drop know your rights patch, which was replaced upstream by their own
110+ development
111+ - delete debian/patches/lp269656_know_your_rights.patch
112+ - update debian/patches/series
113+
114+ -- Alexander Sack <asac@ubuntu.com> Tue, 16 Dec 2008 16:22:10 +0100
115
116 firefox-3.0 (3.0.4+nobinonly-0ubuntu2) jaunty; urgency=low
117
118
119=== modified file 'debian/control'
120--- debian/control 2008-11-26 20:58:10 +0000
121+++ debian/control 2008-12-02 10:54:03 +0000
122@@ -31,8 +31,7 @@
123 xulrunner-1.9 (>= 1.9.0.1),
124 ${shlibs:Depends},
125 firefox-3.0-branding (>= 3.0.3+nobinonly-0ubuntu1~) | abrowser-3.0-branding (>= 3.0.3+nobinonly-0ubuntu1~)
126-Recommends: ubufox,
127-Suggests: firefox-3.0-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0
128+Suggests: ubufox, firefox-3.0-gnome-support (= ${binary:Version}), latex-xft-fonts, libthai0
129 Provides: www-browser, firefox-libthai
130 Conflicts: firefox-trunk (<< 3.0~a8~cvs20070914t1713-0), firefox-granparadiso (<< 3.0~alpha8-0), firefox (<< 3), firefox-libthai
131 Replaces: firefox-trunk, firefox-granparadiso, firefox (<< 3), firefox-libthai
132
133=== removed file 'debian/patches/lp269656_know_your_rights.patch'
134--- debian/patches/lp269656_know_your_rights.patch 2008-10-20 15:33:44 +0000
135+++ debian/patches/lp269656_know_your_rights.patch 1970-01-01 00:00:00 +0000
136@@ -1,480 +0,0 @@
137----
138- browser/base/content/aboutRights.xhtml | 143 +++++++++++++++++++++++++++++++++
139- browser/base/jar.mn | 1
140- browser/components/Makefile.in | 1
141- browser/components/aboutRights.js | 67 +++++++++++++++
142- browser/components/nsBrowserGlue.js | 130 +++++++++++++++++++++++-------
143- browser/installer/unix/packages-static | 1
144- 6 files changed, 316 insertions(+), 27 deletions(-)
145-
146-Index: mozilla/browser/base/content/aboutRights.xhtml
147-===================================================================
148---- /dev/null
149-+++ mozilla/browser/base/content/aboutRights.xhtml
150-@@ -0,0 +1,143 @@
151-+<?xml version="1.0" encoding="UTF-8"?>
152-+
153-+# <!--
154-+# ***** BEGIN LICENSE BLOCK *****
155-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
156-+#
157-+# The contents of this file are subject to the Mozilla Public License
158-+# Version
159-+# 1.1 (the "License"); you may not use this file except in compliance with
160-+# the License. You may obtain a copy of the License at
161-+# http://www.mozilla.org/MPL/
162-+#
163-+# Software distributed under the License is distributed on an "AS IS"
164-+# basis,
165-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
166-+# for the specific language governing rights and limitations under the
167-+# License.
168-+#
169-+# The Original Code is aboutRights.xhtml
170-+#
171-+# The Initial Developer of the Original Code is
172-+# Mozilla Foundation
173-+# Portions created by the Initial Developer are Copyright (C) 1998
174-+# the Initial Developer. All Rights Reserved.
175-+#
176-+# Contributor(s):
177-+# Alexander Sack <asac@canonical.com>
178-+#
179-+# Alternatively, the contents of this file may be used under the terms of
180-+# either the GNU General Public License Version 2 or later (the "GPL"), or
181-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
182-+# in which case the provisions of the GPL or the LGPL are applicable instead
183-+# of those above. If you wish to allow use of your version of this file only
184-+# under the terms of either the GPL or the LGPL, and not to allow others to
185-+# use your version of this file under the terms of the MPL, indicate your
186-+# decision by deleting the provisions above and replace them with the notice
187-+# and other provisions required by the GPL or the LGPL. If you do not delete
188-+# the provisions above, a recipient may use your version of this file under
189-+# the terms of any one of the MPL, the GPL or the LGPL.
190-+#
191-+# ***** END LICENSE BLOCK ***** -->
192-+
193-+<html xmlns="http://www.w3.org/1999/xhtml">
194-+<head>
195-+<title>about:rights</title>
196-+<link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css" media="all" />
197-+</head>
198-+<body>
199-+<div id="aboutPageContainer">
200-+<h1>About: Your Rights</h1>
201-+<p>
202-+Mozilla Firefox is free and open source software, built by a community of
203-+thousands from all over the world. There are a few things you should know:
204-+
205-+
206-+<ul>
207-+ <li>
208-+ Firefox is made available to you under the terms of the
209-+ <a href="http://www.mozilla.org/MPL/MPL-1.1.html" alt="Mozilla Public License version 1.1">Mozilla Public License</a>. This means you may use, copy and distribute Firefox to others. You are also welcome to modify the source code of Firefox as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.
210-+ </li>
211-+
212-+ <li>
213-+ Mozilla does not grant you any rights to the Mozilla and Firefox trademarks
214-+ or logos. Additional information on Trademarks may be found
215-+ <a href="http://www.mozilla.org/foundation/trademarks/policy.html" alt="Mozilla Trademark Policy">here</a>.
216-+ </li>
217-+
218-+ <li>
219-+ Mozilla’s privacy policy for Firefox may be found
220-+ <a href="http://www.mozilla.com/en-US/legal/privacy/firefox-en.html" alt="Firefox Privacy Policy">here</a>.
221-+ </li>
222-+
223-+ <li>
224-+ Firefox also offers optional web site information services, such as the SafeBrowsing service; however, we cannot guarantee they are 100% accurate or error-free. More details, including information on how to disable the services, can be found in the <a href="about:rights#hiddenpart" alt="Mozilla Firefox Web Site Services" onclick="return showhidden()">service terms</a>.
225-+
226-+<div id="part2" style="-moz-border-radius: 3pt;">
227-+<div id="hiddenpart" style="padding: 0em; margin: 0em">
228-+ <h3>Mozilla Firefox Web Site Services</h3>
229-+ <script type="text/javascript">
230-+ h = document.getElementById('hiddenpart');
231-+ p2 = document.getElementById('part2');
232-+ h.style.display = 'none';
233-+ p2.style.background="none";
234-+
235-+ switchElem = document.getElementById("switch");
236-+ function showhidden() {
237-+ if (h.style.display == 'none') {
238-+ h.style.display = 'block';
239-+ }
240-+ else {
241-+ h.style.display = 'none';
242-+ }
243-+ return false;
244-+ }
245-+ </script>
246-+
247-+ <p>
248-+ Mozilla Firefox uses web site information services ("Services"), such as the
249-+ SafeBrowsing service, that are available for your use with this binary version of Firefox as described below. If you do not want to use the Services or the terms below are unacceptable, you may disable the SafeBrowsing service by clicking <b>Edit -> Preferences -> Security</b> and uncheck the options for "Tell me if the site I'm visiting is a suspected attack site" and "Tell me if the site I'm visiting is a suspected forgery."
250-+ </p>
251-+
252-+ <ol>
253-+ <p><li>
254-+ Mozilla and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information. However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified and some safe sites may be identified in error.
255-+ </li></p>
256-+
257-+ <p><li>
258-+ Mozilla may discontinue or change the Services at its discretion.
259-+ </li></p>
260-+
261-+ <p><li>
262-+ You are welcome to use these Services with the accompanying version of
263-+ Firefox, and you have all the rights necessary to do so.  Mozilla and
264-+ its licensors reserve all other rights in the Services.  These terms are
265-+ not intended to limit any rights granted under open source licenses applicable to Firefox and to corresponding source code versions of Firefox.
266-+ </li></p>
267-+
268-+ <p><li><b>
269-+ The Services are provided "as-is." Mozilla, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes. You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to
270-+ you.
271-+ </b></li></p>
272-+
273-+ <p><li><b>
274-+ The Services are provided "as-is." Mozilla, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes. You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.
275-+ </b></li></p>
276-+
277-+ <p><li>
278-+ Mozilla may update these terms as necessary from time to time. These terms may not be modified or cancelled without Mozilla’s written agreement.
279-+ </li></p>
280-+
281-+ <p><li>
282-+ These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.
283-+ </li></p>
284-+ </ol>
285-+</div>
286-+</div>
287-+</li>
288-+</ul>
289-+</p>
290-+</div>
291-+</body>
292-+</html>
293-+
294-Index: mozilla/browser/base/jar.mn
295-===================================================================
296---- mozilla.orig/browser/base/jar.mn
297-+++ mozilla/browser/base/jar.mn
298-@@ -12,16 +12,17 @@
299- % style chrome://global/content/customizeToolbar.xul chrome://browser/skin/
300- * content/browser/aboutDialog.xul (content/aboutDialog.xul)
301- * content/browser/aboutDialog.js (content/aboutDialog.js)
302- content/browser/aboutDialog.css (content/aboutDialog.css)
303- * content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml)
304- content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
305- content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
306- content/browser/aboutRobots-widget-right.png (content/aboutRobots-widget-right.png)
307-+* content/browser/aboutRights.xhtml (content/aboutRights.xhtml)
308- * content/browser/browser.css (content/browser.css)
309- * content/browser/browser.js (content/browser.js)
310- * content/browser/browser.xul (content/browser.xul)
311- * content/browser/credits.xhtml (content/credits.xhtml)
312- * content/browser/EULA.js (content/EULA.js)
313- * content/browser/EULA.xhtml (content/EULA.xhtml)
314- * content/browser/EULA.xul (content/EULA.xul)
315- * content/browser/metaData.js (content/metaData.js)
316-Index: mozilla/browser/components/Makefile.in
317-===================================================================
318---- mozilla.orig/browser/components/Makefile.in
319-+++ mozilla/browser/components/Makefile.in
320-@@ -48,16 +48,17 @@
321- XPIDLSRCS = \
322- nsIBrowserHandler.idl \
323- nsIBrowserGlue.idl \
324- $(NULL)
325-
326- EXTRA_PP_COMPONENTS = \
327- nsBrowserContentHandler.js \
328- nsBrowserGlue.js \
329-+ aboutRights.js \
330- aboutRobots.js \
331- $(NULL)
332-
333- EXTRA_JS_MODULES = distribution.js
334-
335- DIRS = \
336- dirprovider \
337- microsummaries \
338-Index: mozilla/browser/components/aboutRights.js
339-===================================================================
340---- /dev/null
341-+++ mozilla/browser/components/aboutRights.js
342-@@ -0,0 +1,67 @@
343-+/* ***** BEGIN LICENSE BLOCK *****
344-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
345-+ *
346-+ * The contents of this file are subject to the Mozilla Public License Version
347-+ * 1.1 (the "License"); you may not use this file except in compliance with
348-+ * the License. You may obtain a copy of the License at
349-+ * http://www.mozilla.org/MPL/
350-+ *
351-+ * Software distributed under the License is distributed on an "AS IS" basis,
352-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
353-+ * for the specific language governing rights and limitations under the
354-+ * License.
355-+ *
356-+ * The Original Code is http://developer.mozilla.org/En/Code_snippets:JS_XPCOM
357-+ *
358-+ * The Initial Developer of the Original Code is Mozilla Foundation.
359-+ * Portions created by the Initial Developer are Copyright (C) 2008
360-+ * the Initial Developer. All Rights Reserved.
361-+ *
362-+ * Contributor(s):
363-+ * Alexander Sack <asac@canonical.com>
364-+ *
365-+ * Alternatively, the contents of this file may be used under the terms of
366-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
367-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
368-+ * in which case the provisions of the GPL or the LGPL are applicable instead
369-+ * of those above. If you wish to allow use of your version of this file only
370-+ * under the terms of either the GPL or the LGPL, and not to allow others to
371-+ * use your version of this file under the terms of the MPL, indicate your
372-+ * decision by deleting the provisions above and replace them with the notice
373-+ * and other provisions required by the GPL or the LGPL. If you do not delete
374-+ * the provisions above, a recipient may use your version of this file under
375-+ * the terms of any one of the MPL, the GPL or the LGPL.
376-+ *
377-+ * ***** END LICENSE BLOCK ***** */
378-+
379-+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
380-+const Cc = Components.classes;
381-+const Ci = Components.interfaces;
382-+function AboutRightsHandler() { }
383-+
384-+AboutRightsHandler.prototype = {
385-+ newChannel : function(aURI) {
386-+ var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
387-+ var secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].
388-+ getService(Ci.nsIScriptSecurityManager);
389-+ var channel = ios.newChannel("chrome://browser/content/aboutRights.xhtml", null, null);
390-+ channel.originalURI = aURI;
391-+ var principal = secMan.getCodebasePrincipal(aURI);
392-+ channel.owner = principal;
393-+ return channel;
394-+ },
395-+ getURIFlags: function(aURI) {
396-+ return (Ci.nsIAboutModule.ALLOW_SCRIPT |
397-+ Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT);
398-+ },
399-+
400-+ classDescription: "About Rights Page",
401-+ classID: Components.ID("a9de133c-6c09-4a6b-b376-88ad56c0a351"),
402-+ contractID: "@mozilla.org/network/protocol/about;1?what=rights",
403-+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
404-+}
405-+
406-+function NSGetModule(aCompMgr, aFileSpec) {
407-+ return XPCOMUtils.generateModule([AboutRightsHandler]);
408-+}
409-+
410-Index: mozilla/browser/components/nsBrowserGlue.js
411-===================================================================
412---- mozilla.orig/browser/components/nsBrowserGlue.js
413-+++ mozilla/browser/components/nsBrowserGlue.js
414-@@ -67,16 +67,118 @@
415- };
416-
417- // Constructor
418-
419- function BrowserGlue() {
420- this._init();
421- }
422-
423-+// this returns the most recent non-popup browser window
424-+function getMostRecentBrowserWindow() {
425-+ var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
426-+ .getService(Components.interfaces.nsIWindowMediator);
427-+
428-+ var win = wm.getMostRecentWindow("navigator:browser", true);
429-+
430-+ // if we're lucky, this isn't a popup, and we can just return this
431-+ if (win && win.document.documentElement.getAttribute("chromehidden")) {
432-+ var windowList = wm.getEnumerator("navigator:browser", true);
433-+ // this is oldest to newest, so this gets a bit ugly
434-+ while (windowList.hasMoreElements()) {
435-+ var nextWin = windowList.getNext();
436-+ if (!nextWin.document.documentElement.getAttribute("chromehidden"))
437-+ win = nextWin;
438-+ }
439-+ }
440-+ return win;
441-+}
442-+
443-+function getMostRecentBrowser () {
444-+ var browserWindow = getMostRecentBrowserWindow();
445-+ var browser = browserWindow.getBrowser();
446-+ return browser;
447-+}
448-+
449-+function openYourRights () {
450-+ var YOUR_RIGHTS_LOCATION = "about:rights";
451-+ var YOUR_RIGHTS_URI = Components.classes["@mozilla.org/network/io-service;1"]
452-+ .getService(Components.interfaces.nsIIOService)
453-+ .newURI(YOUR_RIGHTS_LOCATION, null, null);
454-+
455-+ var browserDOMWindow = getMostRecentBrowserWindow().browserDOMWindow;
456-+
457-+ browserDOMWindow.openURI (YOUR_RIGHTS_URI,
458-+ null,
459-+ Components.interfaces.nsIBrowserDOMWindow.OPEN_DEFAULTWINDOW,
460-+ null);
461-+}
462-+
463-+function doRightsDisplay(e) {
464-+ var bundleService = Cc["@mozilla.org/intl/stringbundle;1"].
465-+ getService(Ci.nsIStringBundleService);
466-+ var brandBundle = bundleService.createBundle("chrome://branding/locale/brand.properties");
467-+ var appFullName = brandBundle.GetStringFromName("brandFullName");
468-+ appFullName = appFullName != null ? appFullName : "Browser Without Brand";
469-+
470-+ var FIREFOX_WELCOME_TEXT = appFullName + " is free and open source software from the non-profit Mozilla Foundation.";
471-+ var YOURRIGHTS_TEXT = "Know Your Rights...";
472-+ var YOURRIGHTS_ACCESSKEY = "K";
473-+ var buttons = [{ label: YOURRIGHTS_TEXT, accessKey: YOURRIGHTS_ACCESSKEY, callback: openYourRights }];
474-+
475-+ var rbrowser = e.target // getMostRecentBrowser();
476-+ var browser = rbrowser; //rbrowser.getBrowserForDocument(e.target).getTabBrowser();
477-+ var notificationBox = browser.getNotificationBox();
478-+ var notification = notificationBox.getNotificationWithValue("your-rights");
479-+ if (notification)
480-+ notificationBox.removeNotification(notification);
481-+
482-+ notification = notificationBox.appendNotification(FIREFOX_WELCOME_TEXT,
483-+ 'your-rights',"",
484-+ notificationBox.PRIORITY_INFO_HIGH,
485-+ buttons);
486-+ notification.persistence++;
487-+
488-+ browser.removeEventListener ("load", doRightsDisplay, false);
489-+
490-+ var rightsCurrent = "0.0";
491-+ try { rightsCurrent = prefs.getCharPref("xxx.legal.rights.current"); } catch (e) {}
492-+
493-+ var prefs = Components.classes["@mozilla.org/preferences-service;1"]
494-+ .getService(Components.interfaces.nsIPrefBranch);
495-+ prefs.setCharPref("xxx.legal.rights.seen", rightsCurrent);
496-+}
497-+
498-+function scheduleRightsNotification () {
499-+
500-+ var prefs = Components.classes["@mozilla.org/preferences-service;1"]
501-+ .getService(Components.interfaces.nsIPrefBranch);
502-+
503-+ var rightsSeen = null;
504-+ var rightsCurrent = "0.0";
505-+ try { rightsSeen = prefs.getCharPref("xxx.legal.rights.seen"); } catch (e) {}
506-+ try { rightsCurrent = prefs.getCharPref("xxx.legal.rights.current"); } catch (e) {}
507-+
508-+ var bundleService = Cc["@mozilla.org/intl/stringbundle;1"].
509-+ getService(Ci.nsIStringBundleService);
510-+ var brandBundle = bundleService.createBundle("chrome://branding/locale/brand.properties");
511-+
512-+ var appFullName = brandBundle.GetStringFromName("brandFullName");
513-+
514-+ // do not display notification if a) user already saw a notification for the current
515-+ // rights page version _or_ b) this is a not official build (e.g. no Mozilla application)
516-+ if(rightsSeen != null && rightsSeen == rightsCurrent ||
517-+ appFullName == null || appFullName.indexOf("Mozilla") < 0) {
518-+ return;
519-+ }
520-+ var browser = getMostRecentBrowser();
521-+ browser.addEventListener("load", doRightsDisplay, false);
522-+}
523-+
524-+
525- BrowserGlue.prototype = {
526- _saveSession: false,
527-
528- _setPrefToSaveSession: function()
529- {
530- var prefBranch = Cc["@mozilla.org/preferences-service;1"].
531- getService(Ci.nsIPrefBranch);
532- prefBranch.setBoolPref("browser.sessionstore.resume_session_once", true);
533-@@ -94,16 +196,17 @@
534- break;
535- case "prefservice:after-app-defaults":
536- this._onAppDefaults();
537- break;
538- case "final-ui-startup":
539- this._onProfileStartup();
540- break;
541- case "sessionstore-windows-restored":
542-+ scheduleRightsNotification ();
543- this._onBrowserStartup();
544- break;
545- case "browser:purge-session-history":
546- // reset the console service's error buffer
547- const cs = Cc["@mozilla.org/consoleservice;1"].
548- getService(Ci.nsIConsoleService);
549- cs.logStringMessage(null); // clear the console (in case it's open)
550- cs.reset();
551-@@ -170,43 +273,16 @@
552- // other customizations are applied in _onProfileStartup()
553- var distro = new DistributionCustomizer();
554- distro.applyPrefDefaults();
555- },
556-
557- // profile startup handler (contains profile initialization routines)
558- _onProfileStartup: function()
559- {
560-- // Check to see if the EULA must be shown on startup
561--
562-- var prefBranch = Cc["@mozilla.org/preferences-service;1"].
563-- getService(Ci.nsIPrefBranch);
564-- var mustDisplayEULA = false;
565-- try {
566-- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
567-- } catch (e) {
568-- // Pref might not exist
569-- }
570--
571-- // Make sure it hasn't already been accepted
572-- if (mustDisplayEULA) {
573-- try {
574-- var EULAVersion = prefBranch.getIntPref("browser.EULA.version");
575-- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted");
576-- } catch(ex) {
577-- }
578-- }
579--
580-- if (mustDisplayEULA) {
581-- var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"].
582-- getService(Ci.nsIWindowWatcher);
583-- ww2.openWindow(null, "chrome://browser/content/EULA.xul",
584-- "_blank", "chrome,centerscreen,modal,resizable=yes", null);
585-- }
586--
587- this.Sanitizer.onStartup();
588- // check if we're in safe mode
589- var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
590- QueryInterface(Ci.nsIXULRuntime);
591- if (app.inSafeMode) {
592- var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
593- getService(Ci.nsIWindowWatcher);
594- ww.openWindow(null, "chrome://browser/content/safeMode.xul",
595-Index: mozilla/browser/installer/unix/packages-static
596-===================================================================
597---- mozilla.orig/browser/installer/unix/packages-static
598-+++ mozilla/browser/installer/unix/packages-static
599-@@ -240,16 +240,17 @@
600- bin/components/nsDefaultCLH.js
601- bin/components/nsContentPrefService.js
602- bin/components/nsContentDispatchChooser.js
603- bin/components/nsHandlerService.js
604- bin/components/nsWebHandlerApp.js
605- bin/components/libdbusservice.so
606- bin/components/aboutRobots.js
607- bin/components/nsBadCertHandler.js
608-+bin/components/aboutRights.js
609-
610- ; Modules
611- bin/modules/*
612-
613- ; Safe Browsing
614- bin/components/nsSafebrowsingApplication.js
615- bin/components/nsUrlClassifierListManager.js
616- bin/components/nsUrlClassifierLib.js
617
618=== modified file 'debian/patches/series'
619--- debian/patches/series 2008-10-09 12:41:35 +0000
620+++ debian/patches/series 2009-04-03 17:22:56 +0000
621@@ -13,5 +13,4 @@
622 browser_branding.patch
623 ubuntu_codes_amazon.patch
624 bz421977_att334578.patch
625-lp269656_know_your_rights.patch
626 ubuntu_bookmarks.html
627
628=== modified file 'debian/patches/ubuntu_bookmarks.html'
629--- debian/patches/ubuntu_bookmarks.html 2008-10-09 12:41:35 +0000
630+++ debian/patches/ubuntu_bookmarks.html 2009-04-14 17:09:29 +0000
631@@ -20,7 +20,7 @@
632 + <DL><p>
633 + <DT><A HREF="http://www.ubuntulinux.org/" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" ID="rdf:#$kYrW.3">Ubuntu</A>
634 + <DT><A HREF="http://www.ubuntu.com/support" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/x-icon;base64,AAABAAEAICAAAAAAAACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////7+///9/v7//v/+//3////8/v3/+//9//v+/////f///v/+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////v/7//39/v/8/P7/+vz8//X9/v/6/v///v/8//7/+//+/v/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/v7/+v76/6XX+P88p/b/I6D0/2/A8//f9Pz//P/9//3//v/////////////////////////////////////////////////////////////////////////////////+/v7//v7///z+/v/+/f7///78///9///+/v3//v3+//z9/P+84Pn/D5X4/wGS/v8Dkf//BJX4/1y29v/5/P7//P/9/////////////////////////////////////////////////////////////////////////////////////f/+//3//v78//r5/f/o6/r/6en5/+jq+P/z8/3//Pz+/3TB8/8Dk/z/BZL+/wCU/P8GkP//GJr2/+T3/f///f//////////////////////////////////////////////////////////////////////////////////8/T9/6+17v9iZtj/LS3X/xQU0/8SENL/FBLO/yMizP/S2vL/eMX0/wOQ/v8Dkv3/AJL+/wSR/v8dm/T/6ff+//7+/v///////////////////////////////////////////////////////////////////////v////7///+mrN//BgXK/wAE1f8AAdv/AAHZ/wEB2f8AAN3/AQTX/4+Q5//J6fz/G5b3/wKU+/8Bkv7/BZT7/3TG9v/4/f7//v/9///////////////////////////////////////+//3///3///3//f/9//7//v7+/+n5+/96wvH/4PL8//T2+v84OdP/AQDc/wAB2v8CANr/AwDZ/wEA2/8AAdj/Hx/N/9vZ9f/A5vr/XLr3/0yx9/+T0ff/8vr9//n+/v///v7///////////////////////////////////7///z+/v/7//3///79//n+///t+f3/UrL2/wmP+f9uv/X/9vz//7m98P8GBtD/AwHY/wEA3f8BANv/AQHY/wAA2f8AAdn/IyPP/6Kk6P/o6vz/8/P7/87N8//Bx+z//f35//3+/P/////////////////////////////////////////+//3+///9/v7/+v37/2e6+P8Gkvz/AZX6/xCU+f/C5/n//Pr+/1hb2P8FB8z/IiHO/zQz1f8rLNf/Dg7Q/wQD0v8BAd3/AQLW/wsK0P8NDsr/BAbT/xgXzf/SzfD/+/39///////////////////////////////////////8//7//v3///v++/+n2fj/DJP6/wGU/P8Bkv7/ApP8/0+v9//x/Pv/4eL1/8/K8v/x9fz/+/39//f5/v/m5Pr/nKDo/yss0f8CAtb/AgLV/wIA2/8BANz/AgLX/0A+zv/29P3////////////////////+//7+///+//7//v7+//z//P/5//7/8vf8/zak8/8Bkv//AZL+/wOS/v8Bkv7/JZnx/93v+f/+/vz//vz+//3////+/v///////////f/8/vv/7Or8/19Z2/8BA9T/AQHb/wEA3P8AAtf/BgPW/5+f6P/+/f///v7+///+///6//7//v7+//39///8/v3/+/7+///+/f+o2vb/BJT4/wKT+/8Ckf//A5L9/w+V9v+v3Pj//Pz9//r//v/9//7//f/+//////////////////v//v/+/f7/8PP+/0ZJ0/8BAtf/AQDb/wEA2/8CAdr/PDvQ//b5/v/9//7//v7///7/+P/9/v3/7/j+/8LP9P+yx/H/3O77/9Pr+/8woPf/A5H+/wGS/v8FlPr/abz5//n+/P/8//7//P/+///9/////////////////////////f7+//7/+//+/P//29v3/wsMzv8BAtj/AgHa/wAA2/8JCc7/z9X0//3//P/+/v//+v3+/+rx/P9Ceuj/CUnx/wZI9v8bXez/wdP2/77j+P8Kk/n/ApL8/wyW+P/R7vv//v3///z//v/+//7//P7///3//////////////////////f///f7+///9/v/6/P3/XlzX/wEB2/8BAtb/AgDc/wED1P+cnuP//v7+//7+/v///vv/j6vy/wVK+f8DSPr/BEn8/wNI/P84bev/8Pr//yqj8/8Fkf7/NqLx//D8/f/9//7//v/9///+//////3////+//////////////////7//v/9//////7///z//v+pqOn/KCjU/yco0v8uKNb/KCbU/4mJ3v///v7/+//+//v+/v9fje//Akr9/wFL/P8ASf7/A0n9/xBS6P/z+/3/SK7y/wKS/v9Grvb/9v3////////////////////////////////////////////////+/////v/8/////P7///z9/v/4+/7/9/v///r8/f/6+v7/+f39//7+/f/+/v7//v3+/4ir9P8GSvn/BEj5/wRI/f8ESfr/NWvr//L7/f8vo/T/AZL//0Kr9P/1/v3//v////////////////////////////////////////////3//P////z//v/+//3/6PD6/8rZ8v/H2PP/yNn0/8fZ8//f6fb/+v78///+/v/7/v7/6/H8/0l67P8JSe7/BUn0/x1g7f/C0fj/uOP6/weT+v8Bkv3/JZn1/+n4/P/+/////////////////////////////////////////////v/8///////7//z9/P+CqfL/B03w/whM9f8IS/f/CEv1/4qk7v/9/vz//f/9/////P/7//3/9Pj+/8nW9/++y/P/5O77/83o+v8rn/j/A5H//wGV+v8Ikvv/sd34//3+/v/+/v///v/+//z////////////////////+/////v////3+///8/v3/8Pn//zdw6/8BSf7/Akf//wFK/v8ESvj/rMby//7+/f/+//3///////////////////////7//v/8//7/f8Xy/wOV+/8Ck/3/AZL//wSR/v9BqvP/6/r9//z+/v/+/vz//f7+//z//f/9//3//v7//////f/+//3///7+//v9/P+jvvX/Bkr1/wBK/v8BSf3/BEf+/xZY8P/g7v3//P/8//39/v/////////////////+//7//f3+//v+/P/P6Pr/DJP3/wSS/v8Ckv//BJL+/wWS/P9svPn/8vv8//r+/v/9/vz//v3+//7+///+//3//f3+//n+/v/9/vz/0d36/x1b7v8FSfz/Akj//wFK/v8DSvr/YIzx//z9/v/8/v3///3+//////////////////7////+/v///P/+//b++/9Yufb/BJH+/wGT/v8BlPz/A5P8/xmY+P/Z7fv/+v77//z8+//8/vr/+f7+///+/f/8/vr/9/n8/6jB9/8dX+v/AEr6/wFI//8BSP7/BUr4/xFS8f/N2vj///7///3+//////7//////////////////v////3//v/9//7///3//9vt+/8Wl/X/BZL9/wKQ/v8Ck/r/dMX4//n8/v+zx/D/bZnt/7jI8//J1/v/v9L3/5Sw8/9Kee7/CEz0/wxM8/8vZ/T/NW/w/w5Q8P8FSPf/c6Dt//v9/v/8//3//v/+//3//f///////////////////////////////////////v///6/b+P8Vlff/AZP9/yuc8v/j8/3/8PP9/zds7P8BSP3/A0v5/wlJ9v8DSfr/Akj+/wJL9v9Jeuv/zt77//X4///y+f//5O3+/6K67//t9/3///7+////////////////////////////////////////////////////////////+v38/6DY+P8alvP/nNT2//v+/v+Mr/T/Bkj0/wRK+P8BSf3/AEn9/wNI/f8BSfz/O3Hu/+zx/f+Um+X/MjHS/ycmzf9zct3/7O/4//z+/P/6//3////////////////////////////////////////////////////////////+/v//+v7+/8jr/P/u+f7/1+n8/x9Z8P8FSfv/AUj+/wVG//8BSv3/BEj8/wZM9P+vxPP/tLPs/wgH1P8EAdj/AQHa/wED1P9oatj//vv+//7+/v////////////////////////////////////////////////////////////7+//////v/+f79//7+/P+/0vH/L2Xt/wtM9P8FSfz/Akn+/wBJ//8CSf3/FE/y/9vl+f9gX9//AQLT/wMA2v8AAtf/BQDW/x8fzv/w7/3//v39//////////////////////////////////////////////////////////////////////////////////z+/f/y8/7/yNX4/46t8v9ok+7/X4rr/2aM6/+DoO7/7fH8/2ln4P8CAtX/AQDe/wEC1f8BA9T/JiTK/+/0/v///v7//////////////////////////////////////////////////////////////////////////////////f3+//7++f/+/vz/+/7+//v+/v/8/f7/+vz+//n+/P/+/fr/x8bu/xEPyv8BANv/AgHb/wYD1P+FgeD//v38//z//v/////////////////////////////////////////////////////////////////////////////////9/v///f7///z//v/+//7//f7//////f////3////4//z8/v/9/P3/xsDw/1lb1P9ST9T/nZ/i//j5/f/+//7///3///////////////////////////////////////////////////////////////////////////////////7//f////7///7+//3+/P/9/v7//v79//v9///+/vz/+//9//79///8/v3/+/39//n7/f/9/vz//v3+//79/v/9//z/////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" ID="rdf:#$lYrW.3">Ubuntu Support Home</A>
635-+ <DT><A HREF="http://www.ubuntulinux.org/wiki/FrontPage" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ID="rdf:#$mYrW.3">Ubuntu Wiki (community-edited website)</A>
636++ <DT><A HREF="http://wiki.ubuntu.com" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ID="rdf:#$mYrW.3">Ubuntu Wiki (community-edited website)</A>
637 + <DT><A HREF="https://launchpad.net/distros/ubuntu/+addticket" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoFEDIS8aZJ5gAAAjxJREFUOMuVk99LU2Ecxj/v2dnO3NhyO66xTDFLMbGgC7WwLoKiulGiqMvA/oAoioQgKMi8yIqCIOpCoi7yIoouFLpLu8hgRXXR/ImkrjPnqjW3HXe200WbtImZX3h4+cL7fHgeeF/BOidw6aWlttzWeqBOPRpZNPxiPeZ9Nwb3Hm9Ue/ds8TZXqS4evp29Kf+P0XOxn44634WTO9TugHeD7LTbTC2eZjA0/2wVgEnz9cH99arS8FFLj26vUHae2uXrqfS6JElxmLqui+GJ6LvJWHpkBcDX9VycaHx9q70+cMZhlZj8voRTsVKlunE5HdmkrlvmYnHj6af5c+HudmMFwGOXj8iSaBqaenM5kVHiVZ7qnrZtDXa302HomYw8u/Ar9+RDpGvo/KFhgGWAOVUDuUTniHbN1ewfCwm4AggtudGYTj7QFVutEpxeoC+oXR3+mugt+GRzvMKKoJVcogk43OIfCwAqEAdcfkdEllKneRS8m/SVeRxuRcrN93QsJ5YQ1AO7gRogCswB4bxigOEri/YPjGY7q902Kt3Whr8ry4DIX86sohRwP52l3MQklsqGiwHC1DBFAbBUcmaAH8D7lk3OO58j6dkXoZ+3SxPoJQmMPMDI79+29N0L1HlT7oHxeFu4u32mGCBlE2Tl0gqFBBrweDFjj706e/DYn7bFIwDMGbdAtzpBqEBFXioQFFujX/71zGUAsTlumlMkyKoZhCgkiGCxhNb6J0WZTBOY8MpIwgUkRe2CvhbgN4G73+hz2ow4AAAAAElFTkSuQmCC" ID="rdf:#$nYrW.3">Make a Support Request to the Ubuntu Community</A>
638 + <DT><A HREF="http://www.fsf.org/" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC" ID="rdf:#$oYrW.3">Free Software Foundation</A>
639 + <DT><A HREF="http://www.debian.org/" ADD_DATE="1181129907" LAST_MODIFIED="1181129907" ICON="data:image/x-icon;base64,AAABAAQAICAAAAEACACoCAAARgAAACAgEAABAAQA6AIAAO4IAAAQEAAAAQAIAGgFAADWCwAAEBAQAAEABAAoAQAAPhEAACgAAAAgAAAAQAAAAAEACAAAAAAAgAQAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAMDcwADwyqYAACBAAAAgYAAAIIAAACCgAAAgwAAAIOAAAEAAAABAIAAAQEAAAEBgAABAgAAAQKAAAEDAAABA4AAAYAAAAGAgAABgQAAAYGAAAGCAAABgoAAAYMAAAGDgAACAAAAAgCAAAIBAAACAYAAAgIAAAICgAACAwAAAgOAAAKAAAACgIAAAoEAAAKBgAACggAAAoKAAAKDAAACg4AAAwAAAAMAgAADAQAAAwGAAAMCAAADAoAAAwMAAAMDgAADgAAAA4CAAAOBAAADgYAAA4IAAAOCgAADgwAAA4OAAQAAAAEAAIABAAEAAQABgAEAAgABAAKAAQADAAEAA4ABAIAAAQCAgAEAgQABAIGAAQCCAAEAgoABAIMAAQCDgAEBAAABAQCAAQEBAAEBAYABAQIAAQECgAEBAwABAQOAAQGAAAEBgIABAYEAAQGBgAEBggABAYKAAQGDAAEBg4ABAgAAAQIAgAECAQABAgGAAQICAAECAoABAgMAAQIDgAECgAABAoCAAQKBAAECgYABAoIAAQKCgAECgwABAoOAAQMAAAEDAIABAwEAAQMBgAEDAgABAwKAAQMDAAEDA4ABA4AAAQOAgAEDgQABA4GAAQOCAAEDgoABA4MAAQODgAIAAAACAACAAgABAAIAAYACAAIAAgACgAIAAwACAAOAAgCAAAIAgIACAIEAAgCBgAIAggACAIKAAgCDAAIAg4ACAQAAAgEAgAIBAQACAQGAAgECAAIBAoACAQMAAgEDgAIBgAACAYCAAgGBAAIBgYACAYIAAgGCgAIBgwACAYOAAgIAAAICAIACAgEAAgIBgAICAgACAgKAAgIDAAICA4ACAoAAAgKAgAICgQACAoGAAgKCAAICgoACAoMAAgKDgAIDAAACAwCAAgMBAAIDAYACAwIAAgMCgAIDAwACAwOAAgOAAAIDgIACA4EAAgOBgAIDggACA4KAAgODAAIDg4ADAAAAAwAAgAMAAQADAAGAAwACAAMAA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" ID="rdf:#$pYrW.3">Debian (Ubuntu is based on Debian)</A>
640
641=== modified file 'debian/rules'
642--- debian/rules 2008-11-24 11:34:20 +0000
643+++ debian/rules 2008-12-02 10:50:12 +0000
644@@ -191,9 +191,9 @@
645 rm -rf debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/icons
646 rm -rf debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/chrome/icons
647 dh_install -p$(DEBIAN_NAME) \
648- debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/classic.* \
649- debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/en-US.* \
650- debian/tmp-$(DEBIAN_NAME_OTHER)-branding/$(DEBIAN_FF3_DIR)/chrome/browser.* \
651+ debian/tmp-$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/chrome/classic.* \
652+ debian/tmp-$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/chrome/en-US.* \
653+ debian/tmp-$(DEBIAN_NAME)-branding/$(DEBIAN_FF3_DIR)/chrome/browser.* \
654 $(DEBIAN_FF3_DIR)/chrome
655 touch debian/$(DEBIAN_NAME)/$(DEBIAN_FF3_DIR)/.autoreg
656 if [ -d debian/$(DEBIAN_NAME)/usr/lib/xulrunner-addons/extensions ] ; then \

Subscribers

People subscribed via source and target branches