Merge lp:~jderose/ubuntu/natty/couchdb/fix-716237 into lp:ubuntu/natty/couchdb

[Jason Gerard DeRose]

Just copied the updated jquery.couch.js from:

https://github.com/apache/couchdb/commit/064a1d9483cfa33bd0fcc97cb1d97e8e342fdeaf

Have confirmed that this makes things all worky again in Futon and in dmedia-gtk (which also uses jquery.couch.js).

[lp:~jderose/ubuntu/natty/couchdb/fix-716237]

50. By Jason Gerard DeRose on 2011-02-28

Make Futon work with jQuery 1.5 (LP: #716237)

[Martin Pitt (pitti)]

Thanks! Can you please fix that to be a broken out debian/patches/ quilt patch, instead of applying it inline?

review: Needs Fixing

[Jason Gerard DeRose (jderose)]

Martin,

Okay, gotcha. Is there a way to generate the quilt patch from the bzr branch? Maybe I misunderstood how the distributed development stuff works... isn't the idea to be able to just work from bzr directly? That sure seems like awesome thing to be able to do :)

Will update accordingly, thanks for review!

[Martin Pitt (pitti)]

You could try something like "bzr diff > debian/patches/patchname" and remove the debian/ parts from it (plus add it to series).

> isn't the idea to be able to just work from bzr directly?

That'd require machinery to automatically turn debian/patches/foo*.patch into bzr pipelines or looms, which we don't have yet :/ But yes, it'd be the right thing to do with revision control.

[lp:~jderose/ubuntu/natty/couchdb/fix-716237]

51. By Jason Gerard DeRose on 2011-03-04

Okay, back to drawing board, will use quilt properly

52. By Jason Gerard DeRose on 2011-03-04

Merged from natty

53. By Jason Gerard DeRose on 2011-03-04

debian/patches/jquery15-fix.patch: Make Futon work with jQuery 1.5 via
git commit 064a1d9483cfa33bd0fcc97cb1d97e8e342fdeaf (LP: #716237)

54. By Jason Gerard DeRose on 2011-03-04

Added info in patch comment

[Jason Gerard DeRose (jderose)]

Martin,

Okay, I think I setup the patch correctly, although I'm not all that patch system savvy, so please let me know if there is anything I should change/improve.

Thanks for taking the time to look at this!

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-28 10:48:58 +0000
+++ debian/changelog	2011-03-04 04:25:11 +0000
@@ -1,3 +1,10 @@
+couchdb (1.0.1-0ubuntu12) natty; urgency=low
+
+  * debian/patches/jquery15-fix.patch: Make Futon work with jQuery 1.5 via
+    git commit 064a1d9483cfa33bd0fcc97cb1d97e8e342fdeaf (LP: #716237)
+
+ -- Jason Gerard DeRose <[e-mail]>  Thu, 03 Mar 2011 21:14:34 -0700
+
 couchdb (1.0.1-0ubuntu11) natty; urgency=low
 
   * Fix LP: #725064 - Rebuild for libmozjs ABI breakage, again :(

=== added file 'debian/patches/jquery15-fix.patch'
--- debian/patches/jquery15-fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/jquery15-fix.patch	2011-03-04 04:25:11 +0000
@@ -0,0 +1,124 @@
+## Description: Make Futon work with jQuery 1.5
+## Origin/Author: https://github.com/apache/couchdb/commit/064a1d9483cfa33bd0fcc97cb1d97e8e342fdeaf
+## Bug: https://bugs.launchpad.net/couchdb/+bug/716237
+diff -Nur -x '*.orig' -x '*~' fix-716237//share/www/script/jquery.couch.js fix-716237.new//share/www/script/jquery.couch.js
+--- fix-716237//share/www/script/jquery.couch.js	2011-03-03 21:08:06.625297000 -0700
++++ fix-716237.new//share/www/script/jquery.couch.js	2011-03-03 21:13:47.548923366 -0700
+@@ -36,7 +36,7 @@
+     }
+     user_doc.type = "user";
+     if (!user_doc.roles) {
+-      user_doc.roles = []
++      user_doc.roles = [];
+     }
+     return user_doc;
+   };
+@@ -88,7 +88,7 @@
+       $.ajax({
+         type: "GET", url: this.urlPrefix + "/_session",
+         complete: function(req) {
+-          var resp = $.httpData(req, "json");
++          var resp = httpData(req, "json");
+           if (req.status == 200) {
+             if (options.success) options.success(resp);
+           } else if (options.error) {
+@@ -115,7 +115,7 @@
+       user_doc = prepareUserDoc(user_doc, password);
+       $.couch.userDb(function(db) {
+         db.saveDoc(user_doc, options);
+-      })
++      });
+     },
+     
+     login: function(options) {
+@@ -124,7 +124,7 @@
+         type: "POST", url: this.urlPrefix + "/_session", dataType: "json",
+         data: {name: options.name, password: options.password},
+         complete: function(req) {
+-          var resp = $.httpData(req, "json");
++          var resp = httpData(req, "json");
+           if (req.status == 200) {
+             if (options.success) options.success(resp);
+           } else if (options.error) {
+@@ -141,7 +141,7 @@
+         type: "DELETE", url: this.urlPrefix + "/_session", dataType: "json",
+         username : "_", password : "_",
+         complete: function(req) {
+-          var resp = $.httpData(req, "json");
++          var resp = httpData(req, "json");
+           if (req.status == 200) {
+             if (options.success) options.success(resp);
+           } else if (options.error) {
+@@ -167,7 +167,7 @@
+             doc._attachments["rev-"+doc._rev.split("-")[0]] = {
+               content_type :"application/json",
+               data : Base64.encode(rawDocs[doc._id].raw)
+-            }
++            };
+             return true;
+           }
+         }
+@@ -385,7 +385,7 @@
+             dataType: "json", data: toJSON(doc),
+             beforeSend : beforeSend,
+             complete: function(req) {
+-              var resp = $.httpData(req, "json");
++              var resp = httpData(req, "json");
+               if (req.status == 200 || req.status == 201 || req.status == 202) {
+                 doc._id = resp.id;
+                 doc._rev = resp.rev;
+@@ -450,7 +450,7 @@
+         copyDoc: function(docId, options, ajaxOptions) {
+           ajaxOptions = $.extend(ajaxOptions, {
+             complete: function(req) {
+-              var resp = $.httpData(req, "json");
++              var resp = httpData(req, "json");
+               if (req.status == 201) {
+                 if (options.success) options.success(resp);
+               } else if (options.error) {
+@@ -583,7 +583,7 @@
+       if (!uuidCache.length) {
+         ajax({url: this.urlPrefix + "/_uuids", data: {count: cacheNum}, async: false}, {
+             success: function(resp) {
+-              uuidCache = resp.uuids
++              uuidCache = resp.uuids;
+             }
+           },
+           "Failed to retrieve UUID batch."
+@@ -593,6 +593,27 @@
+     }
+   });
+ 
++  var httpData = $.httpData || function( xhr, type, s ) { // lifted from jq1.4.4
++    var ct = xhr.getResponseHeader("content-type") || "",
++      xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
++      data = xml ? xhr.responseXML : xhr.responseText;
++
++    if ( xml && data.documentElement.nodeName === "parsererror" ) {
++      $.error( "parsererror" );
++    }
++    if ( s && s.dataFilter ) {
++      data = s.dataFilter( data, type );
++    }
++    if ( typeof data === "string" ) {
++      if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
++        data = $.parseJSON( data );
++      } else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
++        $.globalEval( data );
++      }
++    }
++    return data;
++  };
++
+   function ajax(obj, options, errorMessage, ajaxOptions) {
+     options = $.extend({successStatus: 200}, options);
+     ajaxOptions = $.extend({contentType: "application/json"}, ajaxOptions);
+@@ -608,7 +629,7 @@
+       },
+       complete: function(req) {
+         try {
+-          var resp = $.httpData(req, "json");
++          var resp = httpData(req, "json");
+         } catch(e) {
+           if (options.error) {
+             options.error(req.status, req, e);