Merge lp:~urbanape/bindwood/fix-544528 into lp:bindwood

[Zachery Bir]

This branch fixes some of the packaging glitches that were present in the 1.0 package added to lucid. These glitches also manifest themselves in the .xpi built with build.sh, so the easiest way to test is to build a local .xpi, install it, and launch firefox with a dummy database:

Stop using a current Bindwood:

  * If you have any version of Bindwood currently installed on your system (bindwood or xul-ext-bindwood packages):

    * Temporarily uninstall it via synaptic.

  * If you have a symlink extension from previous testing, remove the symlink

Back up prefs and prepare Firefox for new version. With Bindwood uninstalled, you can launch Firefox freely and not worry about bookmark interactions.

  * In Firefox, visit the about:config page and create two new preferences to backup existing prefs:

    * bindwood.last_seq.bak with the value from bindwood.last_seq

    * bindwood.latest_modified.bak with the value from bindwood.latest_modified

  * Reset the two existing preferences:

    * bindwood.last_seq

    * bindwood.latest_modified

  * If it's not present already, create a boolean preference called bindwood.debug and set it to true

Build new .xpi:

  * In a checkout of this branch, run `./build.sh`

  * Right-click on the resulting .xpi file in Nautilus and choose to open it with Firefox, and install the .xpi.

  * Quit (don't restart) Firefox.

Launch Firefox with a dummy database name:

  * `BINDWOOD_DB=some_test_database_name firefox &`

  * You should see a window pop up saying that it is performing the first sync.

  * When it's finished, visit your local Couch DB futon instance and look for the 'some_test_database' and verify that bookmarks, folders, and feeds are accounted for.

[Stuart Colville (muffinresearch)]

Works as expected.

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Looks good

review: Approve

[Joshua Hoover (joshuahoover)]

Followed steps and got expected results.

=== modified file 'chrome.manifest'
--- chrome.manifest	2010-01-26 21:24:59 +0000
+++ chrome.manifest	2010-03-25 02:43:17 +0000
@@ -1,4 +1,4 @@
 content bindwood content/
-resource bindwood content/
+resource bindwood modules/
 locale  bindwood en     locale/en/
 overlay chrome://browser/content/browser.xul    chrome://bindwood/content/browserOverlay.xul

=== modified file 'config_build.sh'
--- config_build.sh	2009-09-16 22:21:04 +0000
+++ config_build.sh	2010-03-25 02:43:17 +0000
@@ -4,6 +4,6 @@
 CHROME_PROVIDERS="content locale"
 CLEAN_UP=1
 ROOT_FILES="couchdb_env.sh"
-ROOT_DIRS="defaults"
+ROOT_DIRS="defaults modules"
 BEFORE_BUILD=
 AFTER_BUILD=

=== modified file 'install.rdf'
--- install.rdf	2010-02-01 00:19:15 +0000
+++ install.rdf	2010-03-25 02:43:17 +0000
@@ -4,7 +4,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>[e-mail]</em:id>
-    <em:version>1.0</em:version>
+    <em:version>1.0.1</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into,

=== added directory 'modules'
=== renamed file 'content/bindwood.jsm' => 'modules/bindwood.jsm'
--- content/bindwood.jsm	2010-02-01 00:17:15 +0000
+++ modules/bindwood.jsm	2010-03-25 02:43:17 +0000
@@ -175,6 +175,7 @@
         var nsifile = Cc["@mozilla.org/file/local;1"]
             .createInstance(Ci.nsILocalFile);
         nsifile.initWithPath(couchdb_env_script.path);
+        nsifile.permissions = 0755;
 
         // create an nsIProcess2 to execute this bash script
         var process = Cc["@mozilla.org/process/util;1"]

=== renamed file 'content/couch.jsm' => 'modules/couch.jsm'
=== renamed file 'content/oauth.jsm' => 'modules/oauth.jsm'