Merge lp:~rye/ubuntu/natty/bindwood/update-firefox-6-compat-fix into lp:ubuntu/natty/bindwood

[Roman Yepishev]

Updated the patch using the fix in trunk

Updated the patch using the code from bindwood trunk. The former patch had a bug in it.

[Micah Gersten (micahg)]

This will end up in ppa:ubuntu-mozilla-security/ppa in a few hours and be pushed out. I'm using the version that Chris Coulson pushed to firefox-beta with your changes.

review: Disapprove

[Micah Gersten (micahg)]

Sorry, will be pushed out on release day with Firefox 7.

[Marc Deslauriers (mdeslaur)]

This has been pushed out. Could you please change the merge proposal status? Thanks.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-16 14:44:28 +0000
+++ debian/changelog	2011-09-19 15:57:26 +0000
@@ -1,3 +1,17 @@
+bindwood (1.99.0-0ubuntu1.2) natty-proposed; urgency=low
+
+  * Updated debian/patches/firefox_6_compat.patch (LP: #789107)
+
+ -- Roman Yepishev <[e-mail]>  Mon, 19 Sep 2011 15:25:41 +0000
+
+bindwood (1.99.0-0ubuntu1.1) natty-security; urgency=low
+
+  * Add support for Firefox 6: (LP: #798484)
+    - bump maxVersion to 6.0.*
+    - don't use "class" as a variable name, as it's a reserved keyword
+
+ -- Chris Coulson <[e-mail]>  Fri, 17 Jun 2011 04:34:13 -0500
+
 bindwood (1.99.0-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== added file 'debian/patches/firefox_6_compat.patch'
--- debian/patches/firefox_6_compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/firefox_6_compat.patch	2011-09-19 15:57:26 +0000
@@ -0,0 +1,27 @@
+--- a/install.rdf	2011-03-09 01:46:26 +0000
++++ b/install.rdf	2011-05-26 12:39:13 +0000
+@@ -18,7 +18,7 @@
+       <Description>
+         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+         <em:minVersion>3.5</em:minVersion>
+-        <em:maxVersion>4.0.*</em:maxVersion>
++        <em:maxVersion>6.0.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+ 
+
+--- a/modules/couch.jsm	2011-02-28 15:24:11 +0000
++++ b/modules/couch.jsm	2011-05-26 12:38:50 +0000
+@@ -13,9 +13,8 @@
+ var EXPORTED_SYMBOLS = ["CouchDB", "XMLHttpRequest"];
+ 
+ var XMLHttpRequest = function () {
+-    var class = "@mozilla.org/xmlextras/xmlhttprequest;1";
+-    var service = Components.interfaces.nsIXMLHttpRequest;
+-    return Components.classes[class].getService(service);
++    return Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"].
++                              getService(Components.interfaces.nsIXMLHttpRequest);
+ }
+ 
+ // A simple class to represent a database. Uses XMLHttpRequest to interface with
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-16 14:44:28 +0000
+++ debian/patches/series	2011-09-19 15:57:26 +0000
@@ -1,1 +1,2 @@
 # Quilt patch series
+firefox_6_compat.patch