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

[Micah Gersten]

=== 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 @@
+ubufox (0.9~b1-0ubuntu2) lucid; urgency=low
+
+  * fix LP: #522535 - Apport doesn't recognise Firefox 3.6; add
+    getSourcePackageName(); update getAppVersion() to reflect unversioned
+    Firefox 3.6
+    - add debian/patches/lp522535_fix_content_overlay.patch
+    - update debian/patches/series
+
+ -- Micah Gersten <[e-mail]>  Mon, 15 Mar 2010 16:57:22 -0500
+
 ubufox (0.9~b1-0ubuntu1) lucid; urgency=low
 
   New upstream beta release 0.9b1:

=== 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 @@
+=== modified file 'ubufox-0.9~b1/content/overlay.js'
+---
+ content/overlay.js |   27 ++++++++++++++++-----------
+ 1 file changed, 16 insertions(+), 11 deletions(-)
+
+Index: ubufox-0.9~b1/content/overlay.js
+===================================================================
+--- ubufox-0.9~b1.orig/content/overlay.js
++++ ubufox-0.9~b1/content/overlay.js
+@@ -38,30 +38,38 @@
+ {
+   var versionString = null;
+   try {
+     versionString = Components.classes["@mozilla.org/fuel/application;1"].getService(Components.interfaces.extIApplication).version;
+   } catch (e) {
+   }
+ 
+   if (versionString == null)
+-    return NULL;
++    return null;
+ 
+   if (String_startsWith (versionString, "3.0"))
+     versionString = "3.0";
+   else if (String_startsWith (versionString, "3.5"))
+     versionString = "3.5";
+-  else if (String_startsWith (versionString, "3.6"))
+-    versionString = "3.6";
+-  else if (String_startsWith (versionString, "3.7"))
+-    versionString = "3.7";
++  else // Return null for > 3.6 as firefox is unversioned now
++    versionString = null;
+ 
+   return versionString;
+ }
+ 
++function getSourcePackageName ()
++{
++  var sourcePackageName = "firefox";
++  var versionString = getAppVersion();
++  if (versionString)
++    sourcePackageName = sourcePackageName + "-" + versionString;
++
++  return sourcePackageName;
++}
++
+ var ubufox = {
+   onAddonsLoad: function () {
+     this.isffox3 = false;
+     var labelGetUbuntu = document.getElementById("getUbuntu"); // ffox 2
+     var extensions = document.getElementById("extensions-view");
+     this.strings = document.getElementById("ubufox-strings");
+ 
+     if (!labelGetUbuntu) {
+@@ -152,34 +160,31 @@
+       Components.classes['@mozilla.org/process/util;1']
+       .createInstance(Components.interfaces.nsIProcess);
+ 
+   var nsFile = executable.QueryInterface(Components.interfaces.nsIFile);
+ 
+   procUtil.init(executable);
+ 
+   var args = null;
+-  if (getAppVersion())
+-    args = new Array("-p", "firefox-" + getAppVersion());
+-  else
+-    args = new Array("-p", "firefox" );
++  args = new Array("-p", getSourcePackageName());
+ 
+   var res = procUtil.run(false, args, args.length);
+ }
+ 
+ 
+ function ubufoxGetHelpOnline(event)
+ {
+-  var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+gethelp";
++  var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+gethelp";
+   openUILink(getHelpUrl, event, false, true);
+ }
+ 
+ function ubufoxHelpTranslateLaunchpad(event)
+ {
+-  var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+translate";
++  var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+translate";
+   openUILink(translateUrl, event, false, true);
+ }
+ 
+ function ubufoxCheckExecutable(filename)
+ {
+   var executable =
+       Components.classes['@mozilla.org/file/local;1']
+       .createInstance(Components.interfaces.nsILocalFile);

=== 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 @@
+lp522535_fix_content_overlay.patch