Bindwood

Merge lp:~jamesh/bindwood/version-1.99.0 into lp:bindwood

  1. version-1.99.0
  2. Merge into trunk
Proposed by James Henstridge
Status: Merged
Approved by: James Henstridge
Approved revision: 43
Merged at revision: 41
Proposed branch: lp:~jamesh/bindwood/version-1.99.0
Merge into: lp:bindwood
Diff against target: 44 lines (+12/-2)
2 files modified
install.rdf (+7/-2)
mozmill/tests/test_sync_from_couch.js (+5/-0)
To merge this branch: bzr merge lp:~jamesh/bindwood/version-1.99.0
Reviewer Review Type Date Requested Status
Samuele Pedroni Approve
Eric Casteleijn (community) Approve
Review via email: mp+52975@code.launchpad.net

Commit message

Update the install.rdf metadata, and fix a broken test.

Description of the change

Some updates to the install.rdf metadata:
1. Set <em:unpack> to true so that if we distribute Bindwood as an XPI, Firefox 4 will unpack it. Without this, the extension would remain packed in its XPI and we wouldn't be able to execute the couchdb_env.sh script.
2. Set the author to Canonical Ltd.
3. Set the version number to 1.99.0 so it is obvious we aren't using the previous release.

I also fixed a small test failure that showed up after the last lot of merges.

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve
Revision history for this message
Samuele Pedroni (pedronis) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install.rdf'
2--- install.rdf 2011-02-17 03:50:34 +0000
3+++ install.rdf 2011-03-11 07:38:54 +0000
4@@ -4,9 +4,14 @@
5
6 <Description about="urn:mozilla:install-manifest">
7 <em:id>bindwood@ubuntu.com</em:id>
8- <em:version>1.0.4</em:version>
9+ <em:version>1.99.0</em:version>
10 <em:type>2</em:type>
11
12+ <!-- We run a shell script stored in the extension's directory,
13+ which can't be done if the extension remains packed in its
14+ XPI. -->
15+ <em:unpack>true</em:unpack>
16+
17 <!-- Target Application this extension can install into,
18 with minimum and maximum supported versions. -->
19 <em:targetApplication>
20@@ -20,7 +25,7 @@
21 <!-- Front End MetaData -->
22 <em:name>Bindwood</em:name>
23 <em:description>An extension to synchronize your bookmarks to a local CouchDB.</em:description>
24- <em:creator>Zachery Bir</em:creator>
25+ <em:creator>Canonical Ltd.</em:creator>
26 <em:homepageURL>https://launchpad.net/bindwood</em:homepageURL>
27 </Description>
28 </RDF>
29
30=== modified file 'mozmill/tests/test_sync_from_couch.js'
31--- mozmill/tests/test_sync_from_couch.js 2011-03-08 15:45:54 +0000
32+++ mozmill/tests/test_sync_from_couch.js 2011-03-11 07:38:54 +0000
33@@ -442,6 +442,11 @@
34 parent_guid: 'toolbar_profile_name',
35 title: 'Folder',
36 children: ['child1', 'child2', 'child3'],
37+ application_annotations: {
38+ Firefox: {
39+ profile: "profile_name"
40+ }
41+ }
42 };
43 synchroniser.processRecord(parent_doc);
44 var parent_id = synchroniser.guid_to_id('parent');

Subscribers

People subscribed via source and target branches