Merge lp:~jbicha/account-plugins/depend-on-libaccount-plugin into lp:account-plugins

Proposed by Jeremy Bícha
Status: Merged
Approved by: Ken VanDine
Approved revision: 113
Merged at revision: 112
Proposed branch: lp:~jbicha/account-plugins/depend-on-libaccount-plugin
Merge into: lp:account-plugins
Diff against target: 106 lines (+18/-0)
2 files modified
debian/changelog (+7/-0)
debian/control (+11/-0)
To merge this branch: bzr merge lp:~jbicha/account-plugins/depend-on-libaccount-plugin
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+167670@code.launchpad.net

Commit message

Since nothing depends on libaccount-plugin-google or libaccount-plugin-generic-oauth, UOA is broken for providers that need those pieces. This fixes that.

Description of the change

Since nothing depends on libaccount-plugin-google or libaccount-plugin-generic-oauth, UOA is broken for providers that need those pieces. This fixes that.

To post a comment you must log in.
113. By Jeremy Bícha

thanks Tim

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-05 20:55:48 +0000
+++ debian/changelog 2013-06-05 23:40:42 +0000
@@ -1,3 +1,10 @@
1account-plugins (0.11daily13.06.05.1-0ubuntu2) UNRELEASED; urgency=low
2
3 * Have plugins depend on libaccount-plugin-generic-oauth or
4 libaccount-plugin-google as needed. Thanks Tim Lunn for catching this.
5
6 -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 05 Jun 2013 19:32:57 -0400
7
1account-plugins (0.11daily13.06.05.1-0ubuntu1) saucy; urgency=low8account-plugins (0.11daily13.06.05.1-0ubuntu1) saucy; urgency=low
29
3 [ Ken VanDine ]10 [ Ken VanDine ]
411
=== modified file 'debian/control'
--- debian/control 2013-06-05 19:23:21 +0000
+++ debian/control 2013-06-05 23:40:42 +0000
@@ -45,6 +45,7 @@
45Package: account-plugin-google45Package: account-plugin-google
46Architecture: all46Architecture: all
47Depends: ${shlibs:Depends}, ${misc:Depends},47Depends: ${shlibs:Depends}, ${misc:Depends},
48 libaccount-plugin-google,
48 signon-keyring-extension,49 signon-keyring-extension,
49 signon-plugin-oauth2,50 signon-plugin-oauth2,
50 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),51 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
@@ -54,6 +55,7 @@
54Package: account-plugin-facebook55Package: account-plugin-facebook
55Architecture: all56Architecture: all
56Depends: ${misc:Depends},57Depends: ${misc:Depends},
58 libaccount-plugin-generic-oauth,
57 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),59 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
58Description: GNOME Control Center account plugin for single signon - facebook60Description: GNOME Control Center account plugin for single signon - facebook
59 GNOME Control Center account plugins for single signon61 GNOME Control Center account plugins for single signon
@@ -61,6 +63,7 @@
61Package: account-plugin-twitter63Package: account-plugin-twitter
62Architecture: all64Architecture: all
63Depends: ${misc:Depends},65Depends: ${misc:Depends},
66 libaccount-plugin-generic-oauth,
64 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),67 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
65Description: GNOME Control Center account plugin for single signon - twitter68Description: GNOME Control Center account plugin for single signon - twitter
66 GNOME Control Center account plugins for single signon69 GNOME Control Center account plugins for single signon
@@ -68,6 +71,7 @@
68Package: account-plugin-flickr71Package: account-plugin-flickr
69Architecture: all72Architecture: all
70Depends: ${misc:Depends},73Depends: ${misc:Depends},
74 libaccount-plugin-generic-oauth,
71 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),75 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
72Description: GNOME Control Center account plugin for single signon - flickr76Description: GNOME Control Center account plugin for single signon - flickr
73 GNOME Control Center account plugins for single signon77 GNOME Control Center account plugins for single signon
@@ -75,6 +79,7 @@
75Package: account-plugin-identica79Package: account-plugin-identica
76Architecture: all80Architecture: all
77Depends: ${misc:Depends},81Depends: ${misc:Depends},
82 libaccount-plugin-generic-oauth,
78 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),83 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
79Description: GNOME Control Center account plugin for single signon - identica84Description: GNOME Control Center account plugin for single signon - identica
80 GNOME Control Center account plugins for single signon85 GNOME Control Center account plugins for single signon
@@ -82,6 +87,7 @@
82Package: account-plugin-foursquare87Package: account-plugin-foursquare
83Architecture: all88Architecture: all
84Depends: ${misc:Depends},89Depends: ${misc:Depends},
90 libaccount-plugin-generic-oauth,
85 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),91 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
86Description: GNOME Control Center account plugin for single signon - foursquare92Description: GNOME Control Center account plugin for single signon - foursquare
87 GNOME Control Center account plugins for single signon93 GNOME Control Center account plugins for single signon
@@ -89,6 +95,7 @@
89Package: account-plugin-windows-live95Package: account-plugin-windows-live
90Architecture: all96Architecture: all
91Depends: ${misc:Depends},97Depends: ${misc:Depends},
98 libaccount-plugin-generic-oauth,
92 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),99 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
93Description: GNOME Control Center account plugin for single signon - windows live100Description: GNOME Control Center account plugin for single signon - windows live
94 GNOME Control Center account plugins for single signon101 GNOME Control Center account plugins for single signon
@@ -96,6 +103,7 @@
96Package: account-plugin-sohu103Package: account-plugin-sohu
97Architecture: all104Architecture: all
98Depends: ${misc:Depends},105Depends: ${misc:Depends},
106 libaccount-plugin-generic-oauth,
99 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),107 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
100Description: GNOME Control Center account plugin for single signon - sohu108Description: GNOME Control Center account plugin for single signon - sohu
101 GNOME Control Center account plugins for single signon109 GNOME Control Center account plugins for single signon
@@ -103,6 +111,7 @@
103Package: account-plugin-sina111Package: account-plugin-sina
104Architecture: all112Architecture: all
105Depends: ${misc:Depends},113Depends: ${misc:Depends},
114 libaccount-plugin-generic-oauth,
106 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),115 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
107Description: GNOME Control Center account plugin for single signon - sina116Description: GNOME Control Center account plugin for single signon - sina
108 GNOME Control Center account plugins for single signon117 GNOME Control Center account plugins for single signon
@@ -110,6 +119,7 @@
110Package: account-plugin-linkedin119Package: account-plugin-linkedin
111Architecture: all120Architecture: all
112Depends: ${misc:Depends},121Depends: ${misc:Depends},
122 libaccount-plugin-generic-oauth,
113 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),123 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
114Description: GNOME Control Center account plugin for single signon - LinkedIn124Description: GNOME Control Center account plugin for single signon - LinkedIn
115 GNOME Control Center account plugins for single signon125 GNOME Control Center account plugins for single signon
@@ -117,6 +127,7 @@
117Package: account-plugin-instagram127Package: account-plugin-instagram
118Architecture: all128Architecture: all
119Depends: ${misc:Depends},129Depends: ${misc:Depends},
130 libaccount-plugin-generic-oauth,
120 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),131 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
121Description: GNOME Control Center account plugin for single signon - Instagram132Description: GNOME Control Center account plugin for single signon - Instagram
122 GNOME Control Center account plugins for single signon133 GNOME Control Center account plugins for single signon

Subscribers

People subscribed via source and target branches