Merge lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211 into lp:ubuntu/lucid/libubuntuone

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/libubuntuone now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211. A merge should be performed if necessary.

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-01 15:20:00 +0000
+++ debian/changelog	2010-04-09 09:25:41 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 libubuntuone (0.2.102-0ubuntu1) lucid; urgency=low
 
   * New upstream release.
@@ -88,3 +89,95 @@
   * Initial package
 
  -- Ken VanDine <[e-mail]>  Tue, 16 Feb 2010 15:59:24 -0500
+=======
+libubuntuone (0.2.102-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Should provide a progress indicator (LP: #541046)
+    - No indication that payment pages are secure (LP: #527701)
+    - The music store should start the syncdaemon (LP: #544563)
+    - There's no navigation feature to get back to the main store page 
+      throughout the Ubuntu One store, forcing a restart of 
+      rhythmbox (LP: #544490)
+    - Browsing the music store doesn't work behind an http proxy (LP: #527671)
+  * debian/control
+    - Added build depends for libsoup-gnome2.4-dev
+  * debian/rules
+    - Bump SHLIBS version, should have been done in 0.2.101
+
+ -- Ken VanDine <[e-mail]>  Thu, 01 Apr 2010 15:20:00 -0400
+
+libubuntuone (0.2.101-0ubuntu2) lucid; urgency=low
+
+  * debian/control
+    - Added depends for ubuntuone-client-gnome (LP: #545191)
+
+ -- Ken VanDine <[e-mail]>  Wed, 24 Mar 2010 15:09:34 -0400
+
+libubuntuone (0.2.101-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    - Only show context menu if environment variable defined (LP: #527688)
+    - Export library path from music store widget (LP: #536957)
+    - Show a temporary view when loading the initial store page (LP: #530247)
+
+ -- Ken VanDine <[e-mail]>  Tue, 23 Mar 2010 15:50:24 -0400
+
+libubuntuone (0.2.100-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    - Added mono bindings
+  * debian/control
+    - added build depends needed for the mono bindings
+    - added mono bindings
+  [Jo Shields]
+  * debian/patches/use_debian_cli_policy_0.7_dir.patch
+    - Follow debian CLI policy
+  * debian/rules
+    - Added libubuntuone1.0-cil
+
+ -- Ken VanDine <[e-mail]>  Mon, 08 Mar 2010 11:07:59 -0500
+
+libubuntuone (0.2.91-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    - Check properly for playTrack existing in the page where the JS
+      script is being executed (Stuart Langridge)
+    - correct polling of downloads (Rodrigo Moya) (LP: #527678)
+    - Fixed percentage calculation (Rodrigo Moya)
+    - Use a 5 seconds timeout for polling (Rodrigo Moya)
+    - Add ourselves to the user agent (Stuart Langridge)
+    - fixed delete from basket (LP: #527698)
+
+ -- Ken VanDine <[e-mail]>  Wed, 03 Mar 2010 12:18:35 -0500
+
+libubuntuone (0.2.90-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    - Use the correct marshaller for play-library signal (Rodrigo Moya)
+    - Make song clickable is now a function installed by the plugin
+      and called by the library page, not directly run by the plugin
+     (Stuart Langridge)
+    - Remove the requirement to set THEMUSICSTOREISBROKEN in the
+      environment to see the music store (Stuart Langridge)
+
+ -- Ken VanDine <[e-mail]>  Mon, 22 Feb 2010 21:38:48 -0500
+
+libubuntuone (0.2.2-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    - Installs javascript file into a versioned directory to match the library
+    - Includes missing license files
+  * debian/python-ubuntuone.install
+    - Install the defs with the python bindings
+  * debian/copyright
+    - updated FSF address
+
+ -- Ken VanDine <[e-mail]>  Wed, 17 Feb 2010 10:30:38 -0500
+
+libubuntuone (0.2.1-0ubuntu1) lucid; urgency=low
+
+  * Initial package
+
+ -- Ken VanDine <[e-mail]>  Tue, 16 Feb 2010 15:59:24 -0500
+>>>>>>> MERGE-SOURCE