Ubufox Extension

Merge lp:~micahg/ubufox/ubufox-0.9b1-ubuntu2 into lp:~ubuntu-core-dev/ubufox/ubuntu

  1. ubufox-0.9b1-ubuntu2
  2. Merge into ubuntu
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp:~micahg/ubufox/ubufox-0.9b1-ubuntu2
Merge into: lp:~ubuntu-core-dev/ubufox/ubuntu
Diff against target: 119 lines (+102/-0)
3 files modified
debian/changelog (+10/-0)
debian/patches/lp522535_fix_content_overlay.patch (+91/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~micahg/ubufox/ubufox-0.9b1-ubuntu2
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+21409@code.launchpad.net
To post a comment you must log in.

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 2010-02-17 20:50:02 +0000
3+++ debian/changelog 2010-03-15 22:31:15 +0000
4@@ -1,3 +1,13 @@
5+ubufox (0.9~b1-0ubuntu2) lucid; urgency=low
6+
7+ * fix LP: #522535 - Apport doesn't recognise Firefox 3.6; add
8+ getSourcePackageName(); update getAppVersion() to reflect unversioned
9+ Firefox 3.6
10+ - add debian/patches/lp522535_fix_content_overlay.patch
11+ - update debian/patches/series
12+
13+ -- Micah Gersten <micahg@ubuntu.com> Mon, 15 Mar 2010 16:57:22 -0500
14+
15 ubufox (0.9~b1-0ubuntu1) lucid; urgency=low
16
17 New upstream beta release 0.9b1:
18
19=== added file 'debian/patches/lp522535_fix_content_overlay.patch'
20--- debian/patches/lp522535_fix_content_overlay.patch 1970-01-01 00:00:00 +0000
21+++ debian/patches/lp522535_fix_content_overlay.patch 2010-03-15 22:31:15 +0000
22@@ -0,0 +1,91 @@
23+=== modified file 'ubufox-0.9~b1/content/overlay.js'
24+---
25+ content/overlay.js | 27 ++++++++++++++++-----------
26+ 1 file changed, 16 insertions(+), 11 deletions(-)
27+
28+Index: ubufox-0.9~b1/content/overlay.js
29+===================================================================
30+--- ubufox-0.9~b1.orig/content/overlay.js
31++++ ubufox-0.9~b1/content/overlay.js
32+@@ -38,30 +38,38 @@
33+ {
34+ var versionString = null;
35+ try {
36+ versionString = Components.classes["@mozilla.org/fuel/application;1"].getService(Components.interfaces.extIApplication).version;
37+ } catch (e) {
38+ }
39+
40+ if (versionString == null)
41+- return NULL;
42++ return null;
43+
44+ if (String_startsWith (versionString, "3.0"))
45+ versionString = "3.0";
46+ else if (String_startsWith (versionString, "3.5"))
47+ versionString = "3.5";
48+- else if (String_startsWith (versionString, "3.6"))
49+- versionString = "3.6";
50+- else if (String_startsWith (versionString, "3.7"))
51+- versionString = "3.7";
52++ else // Return null for > 3.6 as firefox is unversioned now
53++ versionString = null;
54+
55+ return versionString;
56+ }
57+
58++function getSourcePackageName ()
59++{
60++ var sourcePackageName = "firefox";
61++ var versionString = getAppVersion();
62++ if (versionString)
63++ sourcePackageName = sourcePackageName + "-" + versionString;
64++
65++ return sourcePackageName;
66++}
67++
68+ var ubufox = {
69+ onAddonsLoad: function () {
70+ this.isffox3 = false;
71+ var labelGetUbuntu = document.getElementById("getUbuntu"); // ffox 2
72+ var extensions = document.getElementById("extensions-view");
73+ this.strings = document.getElementById("ubufox-strings");
74+
75+ if (!labelGetUbuntu) {
76+@@ -152,34 +160,31 @@
77+ Components.classes['@mozilla.org/process/util;1']
78+ .createInstance(Components.interfaces.nsIProcess);
79+
80+ var nsFile = executable.QueryInterface(Components.interfaces.nsIFile);
81+
82+ procUtil.init(executable);
83+
84+ var args = null;
85+- if (getAppVersion())
86+- args = new Array("-p", "firefox-" + getAppVersion());
87+- else
88+- args = new Array("-p", "firefox" );
89++ args = new Array("-p", getSourcePackageName());
90+
91+ var res = procUtil.run(false, args, args.length);
92+ }
93+
94+
95+ function ubufoxGetHelpOnline(event)
96+ {
97+- var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+gethelp";
98++ var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+gethelp";
99+ openUILink(getHelpUrl, event, false, true);
100+ }
101+
102+ function ubufoxHelpTranslateLaunchpad(event)
103+ {
104+- var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+translate";
105++ var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+translate";
106+ openUILink(translateUrl, event, false, true);
107+ }
108+
109+ function ubufoxCheckExecutable(filename)
110+ {
111+ var executable =
112+ Components.classes['@mozilla.org/file/local;1']
113+ .createInstance(Components.interfaces.nsILocalFile);
114
115=== modified file 'debian/patches/series'
116--- debian/patches/series 2008-02-13 15:39:08 +0000
117+++ debian/patches/series 2010-03-15 22:31:15 +0000
118@@ -0,0 +1,1 @@
119+lp522535_fix_content_overlay.patch

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: