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

Proposed by James Westby
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211
Merge into: lp:ubuntu/lucid/libubuntuone
Diff against target: 104 lines (+93/-0) (has conflicts)
1 file modified
debian/changelog (+93/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1<<<<<<< TREE
1libubuntuone (0.2.102-0ubuntu1) lucid; urgency=low2libubuntuone (0.2.102-0ubuntu1) lucid; urgency=low
23
3 * New upstream release.4 * New upstream release.
@@ -88,3 +89,95 @@
88 * Initial package89 * Initial package
8990
90 -- Ken VanDine <ken.vandine@canonical.com> Tue, 16 Feb 2010 15:59:24 -050091 -- Ken VanDine <ken.vandine@canonical.com> Tue, 16 Feb 2010 15:59:24 -0500
92=======
93libubuntuone (0.2.102-0ubuntu1) UNRELEASED; urgency=low
94
95 * New upstream release.
96 - Should provide a progress indicator (LP: #541046)
97 - No indication that payment pages are secure (LP: #527701)
98 - The music store should start the syncdaemon (LP: #544563)
99 - There's no navigation feature to get back to the main store page
100 throughout the Ubuntu One store, forcing a restart of
101 rhythmbox (LP: #544490)
102 - Browsing the music store doesn't work behind an http proxy (LP: #527671)
103 * debian/control
104 - Added build depends for libsoup-gnome2.4-dev
105 * debian/rules
106 - Bump SHLIBS version, should have been done in 0.2.101
107
108 -- Ken VanDine <ken.vandine@canonical.com> Thu, 01 Apr 2010 15:20:00 -0400
109
110libubuntuone (0.2.101-0ubuntu2) lucid; urgency=low
111
112 * debian/control
113 - Added depends for ubuntuone-client-gnome (LP: #545191)
114
115 -- Ken VanDine <ken.vandine@canonical.com> Wed, 24 Mar 2010 15:09:34 -0400
116
117libubuntuone (0.2.101-0ubuntu1) lucid; urgency=low
118
119 * New upstream release.
120 - Only show context menu if environment variable defined (LP: #527688)
121 - Export library path from music store widget (LP: #536957)
122 - Show a temporary view when loading the initial store page (LP: #530247)
123
124 -- Ken VanDine <ken.vandine@canonical.com> Tue, 23 Mar 2010 15:50:24 -0400
125
126libubuntuone (0.2.100-0ubuntu1) lucid; urgency=low
127
128 * New upstream release.
129 - Added mono bindings
130 * debian/control
131 - added build depends needed for the mono bindings
132 - added mono bindings
133 [Jo Shields]
134 * debian/patches/use_debian_cli_policy_0.7_dir.patch
135 - Follow debian CLI policy
136 * debian/rules
137 - Added libubuntuone1.0-cil
138
139 -- Ken VanDine <ken.vandine@canonical.com> Mon, 08 Mar 2010 11:07:59 -0500
140
141libubuntuone (0.2.91-0ubuntu1) lucid; urgency=low
142
143 * New upstream release.
144 - Check properly for playTrack existing in the page where the JS
145 script is being executed (Stuart Langridge)
146 - correct polling of downloads (Rodrigo Moya) (LP: #527678)
147 - Fixed percentage calculation (Rodrigo Moya)
148 - Use a 5 seconds timeout for polling (Rodrigo Moya)
149 - Add ourselves to the user agent (Stuart Langridge)
150 - fixed delete from basket (LP: #527698)
151
152 -- Ken VanDine <ken.vandine@canonical.com> Wed, 03 Mar 2010 12:18:35 -0500
153
154libubuntuone (0.2.90-0ubuntu1) lucid; urgency=low
155
156 * New upstream release.
157 - Use the correct marshaller for play-library signal (Rodrigo Moya)
158 - Make song clickable is now a function installed by the plugin
159 and called by the library page, not directly run by the plugin
160 (Stuart Langridge)
161 - Remove the requirement to set THEMUSICSTOREISBROKEN in the
162 environment to see the music store (Stuart Langridge)
163
164 -- Ken VanDine <ken.vandine@canonical.com> Mon, 22 Feb 2010 21:38:48 -0500
165
166libubuntuone (0.2.2-0ubuntu1) lucid; urgency=low
167
168 * New upstream release.
169 - Installs javascript file into a versioned directory to match the library
170 - Includes missing license files
171 * debian/python-ubuntuone.install
172 - Install the defs with the python bindings
173 * debian/copyright
174 - updated FSF address
175
176 -- Ken VanDine <ken.vandine@canonical.com> Wed, 17 Feb 2010 10:30:38 -0500
177
178libubuntuone (0.2.1-0ubuntu1) lucid; urgency=low
179
180 * Initial package
181
182 -- Ken VanDine <ken.vandine@canonical.com> Tue, 16 Feb 2010 15:59:24 -0500
183>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches

to all changes: