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

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

Commit message

Switch oauth dependency to oauthlib.

Description of the change

This is needed for nightlies to build again after https://code.launchpad.net/~barry/ubuntuone-storage-protocol/lp1077092/+merge/146528 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 2012-09-10 17:50:24 +0000
+++ control 2013-02-11 20:31:31 +0000
@@ -10,7 +10,7 @@
10 pyflakes,10 pyflakes,
11 python-gi,11 python-gi,
12 python-mocker,12 python-mocker,
13 python-oauth (>= 1.0~svn1092),13 python-oauthlib (>= 0.3.5),
14 python-openssl,14 python-openssl,
15 python-protobuf (>= 2.0.3-0ubuntu1),15 python-protobuf (>= 2.0.3-0ubuntu1),
16 python-twisted-core,16 python-twisted-core,
@@ -22,7 +22,7 @@
22Package: python-ubuntuone-storageprotocol22Package: python-ubuntuone-storageprotocol
23Architecture: all23Architecture: all
24Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},24Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
25 python-oauth (>= 1.0~svn1092),25 python-oauthlib (>= 0.3.5),
26 python-openssl,26 python-openssl,
27 python-protobuf (>= 2.0.3-0ubuntu1),27 python-protobuf (>= 2.0.3-0ubuntu1),
28 python-twisted-core,28 python-twisted-core,

Subscribers

People subscribed via source and target branches

to all changes: