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

Proposed by dobey on 2013-02-11
Status: Merged
Approved by: dobey on 2013-02-11
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) 2013-02-11 Approve on 2013-02-11
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.
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2013-02-05 16:20:46 +0000
3+++ control 2013-02-11 22:11:22 +0000
4@@ -30,12 +30,11 @@
5 python-dirspec,
6 python-gi | python-gobject (>= 2.90),
7 python-mocker,
8- python-oauth (>= 1.0~svn1092-0ubuntu2),
9+ python-oauthlib (>= 0.3.5),
10 python-pyinotify,
11 python-qt4,
12 python-qt4-dbus,
13 python-qt4reactor,
14- python-simplejson,
15 python-twisted-core,
16 python-twisted-names,
17 python-twisted-web,
18@@ -93,9 +92,8 @@
19 python-configglue,
20 python-dbus,
21 python-dirspec,
22- python-oauth (>= 1.0~svn1092-0ubuntu2),
23+ python-oauthlib (>= 0.3.5),
24 python-pyinotify,
25- python-simplejson,
26 python-twisted-names,
27 python-twisted-web,
28 python-ubuntu-sso-client (>= 4.1),

Subscribers

People subscribed via source and target branches

to all changes: