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

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: