Merge lp:~urbanape/bindwood/thorough-debugging into lp:bindwood

[Zachery Bir]

[Zachery Bir (urbanape)]

This branch adds copious debugging info to the error log, but only in the environmental presence of
$BINDWOOD_DEBUG. With this branch installed, and launching Firefox normally, you'll see precious
little info in the Error console (errors only, in fact).

If you launch Firefox from the CLI, setting BINDWOOD_DEBUG, thus:

  $ BINDWOOD_DEBUG=1 firefox &

And you look in the error console under Messages, you'll see all the gory details of pushing and pulling bookmarks, as well as event handling their creation and modification.

[dobey (dobey)]

The code/logging looks ok, but I think the packaging should go in a separate branch... like a source package branch at ~ubuntuone-control-tower/ubuntu/karmic/bindwood/karmic (similar to what we have for ubuntuone-storage-protocol and ubuntuone-client currently).

review: Needs Fixing

[dobey (dobey)]

Pull the packaging stuff, and then change the proposal's status to "Resubmit" to create a new proposal which supersedes this one. (Make sure it's the proposal status, and not a review requesting a resubmission, which people seem to get confused by.)

review: Needs Resubmitting

[lp:~urbanape/bindwood/thorough-debugging]

14. By Zachery Bir on 2009-08-31

Removed packaging info

15. By Zachery Bir on 2009-08-31

Resetting the time interval back to 30s

Unmerged revisions

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2009-08-18 19:21:27 +0000
@@ -0,0 +1,4 @@
+[BUILDDEB]
+merge = True
+export-upstream-revision = revid:[e-mail]-20090818180924-l23evvtklqqb8tji
+export-upstream = .

=== modified file 'content/sync.js'
--- content/sync.js	2009-08-18 14:17:30 +0000
+++ content/sync.js	2009-08-27 18:45:48 +0000
@@ -4,16 +4,17 @@
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
  * by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranties of
  * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /* Lots and lots of debugging information */
+
 var Bindwood = {
     bookmarksService: Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"]
         .getService(Components.interfaces.nsINavBookmarksService),
@@ -27,16 +28,20 @@
         .getService(Components.interfaces.nsINavHistoryService),
     ioService: Components.classes["@mozilla.org/network/io-service;1"]
         .getService(Components.interfaces.nsIIOService),
+    envService: Components.classes["@mozilla.org/process/environment;1"]
+        .getService(Components.interfaces.nsIEnvironment),
 
     annotationKey: "bindwood/uuid",
     uuidItemIdMap: {},
 
     generateUUIDString: function() {
-        return Bindwood.uuidService.generateUUID().toString();
+        var uuid = Bindwood.uuidService.generateUUID().toString();
+        Bindwood.writeMessage("Generated UUID: " + uuid);
+        return uuid;
     },
 
-    annotateItemWithUUID: function(itemId, uuid) {
-        var uuid = uuid ? uuid : Bindwood.generateUUIDString();
+    annotateItemWithUUID: function(itemId, seed_uuid) {
+        var uuid = seed_uuid ? seed_uuid : Bindwood.generateUUIDString();
         Bindwood.annotationService.setItemAnnotation(itemId, Bindwood.annotationKey, uuid, 0, Bindwood.annotationService.EXPIRE_NEVER);
         // Whenever we create a new UUID, stash it and the itemId in
         // our local cache.
@@ -47,16 +52,24 @@
     itemIdForUUID: function(uuid) {
         // First, try to look it up in our local cache, barring that
         // (which shouldn't happen), look it up slowly.
+        Bindwood.writeMessage("Looking up itemId for uuid: " + uuid);
         var itemId = Bindwood.uuidItemIdMap[uuid];
 
         if (!itemId) {
+            Bindwood.writeMessage("Didn't find itemId, looking up annotations");
             var items = Bindwood.annotationService.getItemsWithAnnotation(Bindwood.annotationKey, {});
+            var num_items = items.length;
+            Bindwood.writeMessage("Looking through " + num_items + "item" + (num_items != 1 ? "s" : ""));
             for (var i = 0; i < items.length; i++) {
                 if (Bindwood.annotationService.getItemAnnotation(items[i], Bindwood.annotationKey) == uuid) {
                     Bindwood.uuidItemIdMap[uuid] = itemId = items[i];
+                    Bindwood.writeMessage("Found the matching itemId: " + itemId);
                     break;
                 }
             }
+            if (!itemId) {
+                Bindwood.writeMessage("XXX: Still haven't found the right itemId!");
+            }
         }
         return itemId;
     },
@@ -64,13 +77,15 @@
     uuidForItemId: function(itemId) {
         // Try to look up the uuid, and failing that, assign a new one
         // and return it.
+        Bindwood.writeMessage("Looking up a UUID for itemId: " + itemId);
         var uuid;
-        var found = false;
         try {
             uuid = Bindwood.annotationService.getItemAnnotation(itemId, Bindwood.annotationKey);
-            found = true;
+            Bindwood.writeMessage("Found it: " + uuid);
         } catch(e) {
+            Bindwood.writeError("Didn't find a UUID for itemId: " + itemId, e);
             uuid = Bindwood.annotateItemWithUUID(itemId, null);
+            Bindwood.writeMessage("Didn't find it, so made it: " + uuid);
         }
 
         return uuid;
@@ -78,15 +93,16 @@
 
     writeMessage: function(aMessage) {
         // convenience method for logging. Way better than alert()s.
-        Bindwood.consoleService.logStringMessage("Bindwood: " + aMessage);
+        if (Bindwood.envService.exists('BINDWOOD_DEBUG')) {
+            Bindwood.consoleService.logStringMessage("Bindwood: " + aMessage);
+        }
     },
 
     writeError: function(aMessage, e) {
-        Bindwood.writeMessage(aMessage + "message: '" + e.message + "', reason: '" + e.reason + "', description: '" + e.description + "', error: '" + e.error + "'");
+        // This should fire whether we're in DEBUG or not
+        Bindwood.consoleService.logStringMessage("Bindwood: " + aMessage + " message: '" + e.message + "', reason: '" + e.reason + "', description: '" + e.description + "', error: '" + e.error + "'");
     },
 
-
-
     init: function() {
         // Start the process and de-register ourself
         // http://forums.mozillazine.org/viewtopic.php?f=19&t=657911&start=0
@@ -95,7 +111,7 @@
         if(Components.classes["@mozilla.org/appshell/window-mediator;1"]
            .getService(Components.interfaces.nsIWindowMediator)
            .getEnumerator("").getNext() == window) {
-           Bindwood.writeMessage("Getting a Couch Port");
+            Bindwood.writeMessage("First window opened. Getting a Couch Port");
             Bindwood.getCouchPortNumber(Bindwood.startProcess);
         }
     },
@@ -107,10 +123,12 @@
 
         // find OS temp dir to put the tempfile in
         // https://developer.mozilla.org/index.php?title=File_I%2F%2FO#Getting_special_files
+        Bindwood.writeMessage("Creating temp dir");
         var tmpdir = Components.classes["@mozilla.org/file/directory_service;1"]
                      .getService(Components.interfaces.nsIProperties)
                      .get("TmpD", Components.interfaces.nsIFile);
         // create a randomly named tempfile in the tempdir
+        Bindwood.writeMessage("Creating temp file");
         var tmpfile = Components.classes["@mozilla.org/file/local;1"]
                      .createInstance(Components.interfaces.nsILocalFile);
         tmpfile.initWithPath(tmpdir.path + "/desktopcouch." + Math.random());
@@ -130,13 +148,14 @@
 
         // create an nsIProcess2 to execute this bash script
         var process = Components.classes["@mozilla.org/process/util;1"]
-                        .createInstance(Components.interfaces.nsIProcess2);
+            .createInstance(Components.interfaces.nsIProcess2);
         process.init(nsifile);
 
         // Run the process, passing the tmpfile path
         var args = [tmpfile.path];
+        Bindwood.writeMessage("Running dbus script");
         process.runAsync(args, args.length, {
-            observe: function(process, finishState, data) {
+            observe: function(process, finishState, unused_data) {
                 var port = 5984;
                 if (finishState == "process-finished") {
                     // read temp file to find port number
@@ -151,7 +170,7 @@
                     let (str = {}) {
                       cstream.readString(-1, str); // read the whole file and put it in str.value
                       data = str.value;
-                    }
+                    };
                     cstream.close(); // this closes fstream
                     data = data.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
                     if (/^[0-9]+$/.test(data)) {
@@ -173,11 +192,14 @@
         Bindwood.writeMessage("Starting process with Couch on port " + couchPortNumber);
         CouchDB.PORT_NUMBER = couchPortNumber;
         try {
+            Bindwood.writeMessage("Pushing bookmarks");
             Bindwood.pushBookmarks();
         } catch(e) {
             Bindwood.writeError("Error when calling pushBookmarks: ", e);
         }
+        Bindwood.writeMessage("Creating view, if it's not there already");
         Bindwood.createView();
+        Bindwood.writeMessage("Pulling initial bookmarks");
         Bindwood.pullBookmarks();
     },
 
@@ -231,7 +253,11 @@
         try {
             couch.createDb();
         } catch (e) {
-            Bindwood.writeError("Error when creating database in pushBookmarks (file_exists is OK here): ", e);
+            if (e.error == 'file_exists') {
+                Bindwood.writeMessage("Database already exists. We're okay.");
+            } else {
+                Bindwood.writeError("Error when creating database in pushBookmarks: ", e);
+            }
         }
 
         Bindwood.pushBookmarksFromList(Bindwood.bookmarksService.toolbarFolder,
@@ -252,10 +278,12 @@
             var node = rootNode.getChild(i);
             if (Bindwood.bookmarksService.getItemType(node.itemId) !=
                 Bindwood.bookmarksService.TYPE_BOOKMARK) {
+                Bindwood.writeMessage("Got something that isn't a bookmark");
                 continue;
             }
 
             var title = Bindwood.bookmarksService.getItemTitle(node.itemId);
+            Bindwood.writeMessage("Got title: " + title);
             try {
                 var metadata = Bindwood.bookmarksService.getBookmarkURI(node.itemId);
             } catch(e) {
@@ -263,6 +291,7 @@
                 continue;
             }
             var uuid = Bindwood.uuidForItemId(node.itemId);
+            Bindwood.writeMessage("Got uuid: " + uuid);
             retval.push({
                 title: title,
                 metadata: metadata,
@@ -274,13 +303,23 @@
     },
 
     pushBookmarksFromList: function(bookmarksList, bookmarksListName, db) {
+        Bindwood.writeMessage("Pushing bookmarks from " + bookmarksListName);
         var bookmarkData = Bindwood.getBookmarksFromList(bookmarksList);
         for (var i = 0; i < bookmarkData.length; i++) {
             // find this bookmark in CouchDB
-            var uuid = Bindwood.uuidForItemId(bookmarkData[i].id);
+            Bindwood.writeMessage("Looking up this record in Couch");
+            var itemId = bookmarkData[i].id;
+            var uuid = bookmarkData[i].uuid;
             var uri =  bookmarkData[i].metadata.spec;
             var title = bookmarkData[i].title;
 
+            Bindwood.writeMessage("Bookmark itemId: " + itemId +
+                                  " has uuid: " + uuid +
+                                  " uri: " + uri +
+                                  " and title: \"" + title + "\"");
+
+            Bindwood.uuidItemIdMap[uuid] = itemId;
+
             var results = db.query(function(doc) {
                 if (doc.application_annotations &&
                     doc.application_annotations.Firefox &&
@@ -293,6 +332,7 @@
 
             if (results.rows.length === 0) {
                 // this bookmark is not in CouchDB, so write it
+                Bindwood.writeMessage("No bookmark with uuid: " + uuid + ", so we're making one");
                 var record = {
                     record_type: "http://example.com/bookmark",
                     uri: uri,
@@ -306,10 +346,12 @@
                 };
                 try {
                     db.save(record);
+                    Bindwood.writeMessage("Saved new bookmark to Couch.");
                 } catch(e) {
                     Bindwood.writeError("Problem saving bookmark to CouchDB; bookmark is " + JSON.stringify(record) + ": ", e);
                 }
             } else {
+                Bindwood.writeMessage("This bookmark (" + uuid + ") is already in Couch, skipping");
                 // bookmark is already in CouchDB, so do nothing
             }
         }
@@ -326,12 +368,14 @@
                 if (doc.record_type == "http://example.com/bookmark") {
                     emit(doc._id,doc);
                 }
-            });
+                                   });
+            Bindwood.writeMessage("Pulled all bookmark records from Couch");
         } catch(e) {
             Bindwood.writeError("Problem fetching all bookmarks from Couch: ", e);
         }
         for (var i = 0; i < rows.rows.length; i++) {
             var recordid = rows.rows[i].id;
+            Bindwood.writeMessage("Pulling record: " + recordid);
             var bm = rows.rows[i].value;
             if (bm.application_annotations &&
                 bm.application_annotations.Firefox &&
@@ -339,7 +383,7 @@
                 // this bookmark has a uuid, so check its values haven't changed
                 // find the bookmark with this uuid
                 var couch_uuid = bm.application_annotations.Firefox.uuid;
-                Bindwood.writeMessage("Row uuid: " + couch_uuid);
+                Bindwood.writeMessage("This bookmark has a uuid: " + couch_uuid + " so we're looking it up locally");
                 var itemId = Bindwood.itemIdForUUID(couch_uuid);
                 if (!itemId) {
                     // This bookmark has a uuid, but it's not one of ours.
@@ -348,24 +392,32 @@
                     //   make the uuids the same), or (b) it's a new one
                     //   that happens to have been created on a different
                     //   machine.
+                    Bindwood.writeMessage("We didn't find that uuid: " + couch_uuid + " in the ItemId map, so we'll need to search for it by URI");
                     try {
                         var uri = Bindwood.ioService.newURI(bm.uri, null, null);
+                        Bindwood.writeMessage("Made a new URI from the bookmark's uri: " + bm.uri);
                     } catch(e) {
-                        Bindwood.writeError("Problem creating URI (" + bm.uri + ") for bookmark: ", e);
+                        Bindwood.writeError("Problem creating URI (" + bm.uri + ") for bookmark, skipping: ", e);
                         continue;
                     }
                     var ids = Bindwood.bookmarksService.getBookmarkIdsForURI(uri, {});
                     if (ids.length > 1) {
+                        Bindwood.writeMessage("Wow, didn't expect that. Multiple (" + ids.length + ") bookmarks found locally for the same URI: " + bm.uri);
                         // punt for now, too many problems.
                     } else if (ids.length) {
                         // Found one local bookmark. Replace its uuid to
                         // be the one from Couch.
-                        var itemId = ids[0];
+                        Bindwood.writeMessage("We found one bookmark with the URI from Couch, so we're going to stamp Couch's uuid on it");
+                        itemId = ids[0];
                         var old_uuid = Bindwood.uuidForItemId(itemId);
+                        Bindwood.writeMessage("Got the old uuid: " + old_uuid);
                         delete Bindwood.uuidItemIdMap[old_uuid];
+                        Bindwood.writeMessage("Deleted the old uuid from the ItemId map");
                         Bindwood.annotateItemWithUUID(itemId, couch_uuid);
+                        Bindwood.writeMessage("Annotated the local bookmark with the uuid from Couch: " + couch_uuid);
                     } else {
                         /// No local bookmarks
+                        Bindwood.writeMessage("No local bookmark found, must be a new entry in Couch. Creating locally.");
                         Bindwood.addLocalBookmark(bm, recordid, couch_uuid);
                     }
                 } else {
@@ -374,17 +426,22 @@
                         // flagged for deletion by another Client. We
                         // want to respect that, and delete it
                         // locally.
+                        Bindwood.writeMessage("This bookmark exists on Couch, but has been flagged for deletion, so we're deleting it locally");
                         Bindwood.bookmarksService.removeItem(itemId);
+                        Bindwood.writeMessage("Local copy deleted");
                     } else {
                         var title = Bindwood.bookmarksService.getItemTitle(itemId);
                         var metadata = Bindwood.bookmarksService.getBookmarkURI(itemId);
                         if (title != bm.title) {
+                            Bindwood.writeMessage("Resetting local title to title from Couch");
                             Bindwood.bookmarksService.setItemTitle(itemId, bm.title);
                         }
                         if (metadata.spec != bm.uri) {
+                            Bindwood.writeMessage("The URI from Couch (" + bm.uri + ") is different from local (" + metadata.spec + ")");
                             try {
-                                metadata = Bindwood.ioService.newURI(bm.uri, null, null);
-                                Bindwood.bookmarksService.changeBookmarkURI(itemId, metadata);
+                                var new_uri = Bindwood.ioService.newURI(bm.uri, null, null);
+                                Bindowod.writeMessage("Creating a new URI for our local bookmark");
+                                Bindwood.bookmarksService.changeBookmarkURI(itemId, new_uri);
                             } catch(e) {
                                 Bindwood.writeError("Problem creating a new URI for bookmark: ", e);
                             }
@@ -393,18 +450,20 @@
                 }
             } else {
                 // This bookmark has no uuid, so create it from fresh
-                // in Firefox. Passing in null to addLocalBookmar will
+                // in Firefox. Passing in null to addLocalBookmark will
                 // generate a new uuid.
+                Bindwood.writeMessage("This bookmark from Couch has no uuid (not sure how that happened - manual creation in Couch?), so we're creating it locally, and saving it back.");
                 Bindwood.addLocalBookmark(bm, recordid, null);
             }
         }
         // reschedule ourself
-        setTimeout(Bindwood.pullBookmarks, 30000);
+        Bindwood.writeMessage("Successful run, rescheduling ourself");
+        setTimeout(Bindwood.pullBookmarks, 300000);
     },
 
     addLocalBookmark: function(bm, recordid, uuid) {
         var couch = new CouchDB('bookmarks');
-        var list;
+        var list = Bindwood.bookmarksService.toolbarFolder;
         if (bm.application_annotations &&
             bm.application_annotations.Firefox &&
             bm.application_annotations.Firefox.list) {
@@ -416,28 +475,39 @@
                 list = Bindwood.bookmarksService.bookmarksMenuFolder;
                 break;
             default:
-                list = Bindwood.bookmarksService.toolbarFolder;
                 break;
             }
-        } else {
-            list = Bindwood.bookmarksService.toolbarFolder;
-        }
-        var metadata = Bindwood.ioService.newURI(bm.uri, null, null);
-
-        var itemId = Bindwood.bookmarksService.insertBookmark(list,
-            metadata, -1, bm.title);
+        }
+        Bindwood.writeMessage("Established the correct list for ths bookmark to reside");
+
+        try {
+            var new_uri = Bindwood.ioService.newURI(bm.uri, null, null);
+            Bindowod.writeMessage("Creating a new URI for our local bookmark");
+            Bindwood.bookmarksService.changeBookmarkURI(itemId, new_uri);
+        } catch(e) {
+            Bindwood.writeError("Problem creating a new URI for bookmark: ", e);
+        }
+
+        var itemId = Bindwood.bookmarksService.insertBookmark(
+            list, new_uri, -1, bm.title);
+        Bindwood.writeMessage("Inserting the new bookmark, locally");
         // and then write the new uuid back to the record
-        var uuid = uuid ? uuid : Bindwood.uuidForItemId(itemId);
+        var new_uuid = uuid ? uuid : Bindwood.uuidForItemId(itemId);
+        Bindwood.writeMessage("Since it's a new bookmark, we have a new uuid: " + new_uuid);
         var doc = couch.open(recordid);
         if (!doc.application_annotations) {
+            Bindwood.writeMessage("Adding a new Applications annotation");
             doc.application_annotations = {};
         }
         if (!doc.application_annotations.Firefox) {
+            Bindwood.writeMessage("Adding a new Firefox annotation");
             doc.application_annotations.Firefox = {};
         }
-        doc.application_annotations.Firefox.uuid = uuid;
+        Bindwood.writeMessage("Adding the new uuid to the Firefox annotation");
+        doc.application_annotations.Firefox.uuid = new_uuid;
         try {
             couch.save(doc);
+            Bindwood.writeMessage("Saved the doc back to Couch");
         } catch(e) {
             Bindwood.writeError("Problem writing record for new bookmark: ",e);
         }
@@ -448,13 +518,17 @@
         onItemAdded: function(aItemId, aFolder, aIndex) {
             // A bookmark has been added, so we create a blank entry
             // in Couch with our local itemId attached.
+            Bindwood.writeMessage("A new bookmark was created. Its id is: " + aItemId +
+                                  " at location: " + aIndex +
+                                  " in folder: " + aFolder );
             netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
 
             var couch = new CouchDB('bookmarks');
 
             var uuid = Bindwood.uuidForItemId(aItemId);
+            Bindwood.writeMessage("Determined uuid for new bookmark: " + uuid);
 
-            var list;
+            var list = "toolbarFolder";
             switch(aFolder) {
                 case Bindwood.bookmarksService.toolbarFolder:
                     list = "toolbarFolder";
@@ -463,7 +537,6 @@
                     list = "bookmarksMenuFolder";
                     break;
                 default:
-                    list = "toolbarFolder";
                     break;
             }
 
@@ -477,8 +550,11 @@
                 }
             };
 
+            Bindwood.writeMessage("Created a minimal record document with our uuid");
+
             try {
                 var result = couch.save(doc);
+                Bindwood.writeMessage("Saved new, bare record to Couch.");
             } catch(e) {
                 Bindwood.writeError("Problem saving new bookmark to Couch: ", e);
             }
@@ -487,6 +563,7 @@
             // A bookmark has been removed. This is called before it's
             // been removed locally, though we're passed the itemId,
             // which we use to delete from Couch.
+            Bindwood.writeMessage("Record " + aItemId + " is about to be removed locally.");
             netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
 
             var couch = new CouchDB('bookmarks');
@@ -515,25 +592,30 @@
 
             try {
                 var result = couch.save(doc);
+                Bindwood.writeMessage("Saved document back to Couch with deleted flag set.");
                 // Also remove from our local cache and remove
                 // annotation from service.
                 delete Bindwood.uuidItemIdMap[uuid];
+                Bindwood.writeMessage("Deleted local reference in the uuid-itemId mapping.");
             } catch(e) {
                 Bindwood.writeError("Problem pushing deleted record to Couch: ", e);
             }
         },
         onItemRemoved: function(aItemId, aFolder, aIndex) {
             Bindwood.annotationService.removeItemAnnotation(aItemId, Bindwood.annotationKey);
+            Bindwood.writeMessage("Removed annotations from bookmark identified by: " + aItemId);
         },
         onItemChanged: function(aBookmarkId, aProperty, aIsAnnotationProperty, aValue) {
             // A property of a bookmark has changed. On multiple
             // property updates, this will be called multiple times,
             // once per property (i.e., for title and URI)
+            Bindwood.writeMessage("A property (" + aProperty + ") on bookmark id: " + aBookmarkId + " has been set to: " + aValue);
             netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead UniversalBrowserWrite");
 
             var couch = new CouchDB('bookmarks');
 
             var uuid = Bindwood.uuidForItemId(aBookmarkId);
+            Bindwood.writeMessage("Determined uuid for this bookmark: " + aBookmarkId + " is: " + uuid);
 
             var results = couch.query(function(doc) {
                 if (doc.application_annotations &&
@@ -552,9 +634,11 @@
 
             var doc = couch.open(results.rows[0].id);
             doc[aProperty.toString()] = aValue.toString();
+            Bindwood.writeMessage("Set the new property on the document from Couch.");
 
             try {
                 var result = couch.save(doc);
+                Bindwood.writeMessage("Saved the document back to Couch");
             } catch(e) {
                 Bindwood.writeError("Problem saving updated bookmark to Couch: ", e);
             }

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2009-08-18 19:51:45 +0000
@@ -0,0 +1,6 @@
+bindwood (0.2~~rev9-0ubuntu1) karmic; urgency=low
+
+  [ Elliot Murphy ]
+  * Initial packaging. (LP: #408758)
+
+ -- Elliot Murphy <[e-mail]>  Tue, 18 Aug 2009 10:21:57 -0400

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2009-08-06 10:17:44 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2009-08-18 19:51:07 +0000
@@ -0,0 +1,22 @@
+Source: bindwood
+Section: web
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <[e-mail]>
+XSBC-Original-Maintainer: Elliot Murphy <[e-mail]>
+Build-Depends: debhelper (> 7), cdbs, mozilla-devscripts (>= 0.14), zip
+Vcs-Bzr: lp:~ubuntu-dev/firefox-extensions/bindwood.ubuntu
+Vcs-Browser: https://code.launchpad.net/~ubuntu-dev/firefox-extensions/bindwood.ubuntu
+Standards-Version: 3.8.3
+
+Package: bindwood
+Architecture: all
+Depends: ${xpi:Depends},
+    couchdb,
+    python-desktopcouch
+Description: Firefox bookmark syncing with desktop couchdb.
+ Extension package for firefox provides bookmark syncing with local desktop
+ couchdb, bookmarks can then be replicated to other couchdb instances.
+ .
+ You can uninstall this package if you don't want to sync bookmarks with your
+ local desktop couchdb.
+

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2009-08-06 10:17:44 +0000
@@ -0,0 +1,43 @@
+This is the Ubuntu package of bindwood, a Firefox extension for
+syncing your bookmarks to desktopcouch.
+
+It was packaged by Elliot Murphy  <[e-mail]>
+
+The upstream sources can be found at:
+
+    https://code.launchpad.net/bindwood
+
+content/couch.js:
+
+Copyright (C) 2009 Apache Software Foundation
+
+License:
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this software except in compliance with the License
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+On Debian systems, the complete text of the Apache License can be found
+in `/usr/share/common-licenses/Apache-2.0'.
+
+
+All other files and debian packaging:
+
+Copyright (C) 2009 Canonical Ltd.
+
+License:
+
+GNU GENERAL PUBLIC LICENSE Version 3
+
+The full text can be found at:
+  /usr/share/common-licenses/GPL-3 or http://www.gnu.org/licenses/gpl.txt
+

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2009-08-06 10:17:44 +0000
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+MOZ_EXTENSION_PKG := bindwood
+MOZ_XPI_BUILD_COMMAND = sh build.sh
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/mozilla-devscripts/xpi.mk
+