Merge lp:~dobey/ubuntuone-client/oauthlib into lp:ubuntuone-client/packaging-dailies

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 74
Merged at revision: 74
Proposed branch: lp:~dobey/ubuntuone-client/oauthlib
Merge into: lp:ubuntuone-client/packaging-dailies
Diff against target: 28 lines (+2/-4)
1 file modified
control (+2/-4)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/oauthlib
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+147787@code.launchpad.net

Commit message

Switch to oauthlib from oauth.
We no longer need simplejson either.

Description of the change

This is needed for nightlies to build again after https://code.launchpad.net/~barry/ubuntuone-client/lp1077089/+merge/141828 lands.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'control'
--- control 2013-02-05 16:20:46 +0000
+++ control 2013-02-11 22:11:22 +0000
@@ -30,12 +30,11 @@
30 python-dirspec,30 python-dirspec,
31 python-gi | python-gobject (>= 2.90),31 python-gi | python-gobject (>= 2.90),
32 python-mocker,32 python-mocker,
33 python-oauth (>= 1.0~svn1092-0ubuntu2),33 python-oauthlib (>= 0.3.5),
34 python-pyinotify,34 python-pyinotify,
35 python-qt4,35 python-qt4,
36 python-qt4-dbus,36 python-qt4-dbus,
37 python-qt4reactor,37 python-qt4reactor,
38 python-simplejson,
39 python-twisted-core,38 python-twisted-core,
40 python-twisted-names,39 python-twisted-names,
41 python-twisted-web,40 python-twisted-web,
@@ -93,9 +92,8 @@
93 python-configglue,92 python-configglue,
94 python-dbus,93 python-dbus,
95 python-dirspec,94 python-dirspec,
96 python-oauth (>= 1.0~svn1092-0ubuntu2),95 python-oauthlib (>= 0.3.5),
97 python-pyinotify,96 python-pyinotify,
98 python-simplejson,
99 python-twisted-names,97 python-twisted-names,
100 python-twisted-web,98 python-twisted-web,
101 python-ubuntu-sso-client (>= 4.1),99 python-ubuntu-sso-client (>= 4.1),

Subscribers

People subscribed via source and target branches

to all changes: