Merge lp:~mardy/account-plugins/lp1252751 into lp:account-plugins

Proposed by Alberto Mardegan on 2013-12-12
Status: Merged
Merged at revision: 132
Proposed branch: lp:~mardy/account-plugins/lp1252751
Merge into: lp:account-plugins
Diff against target: 48 lines (+9/-3)
3 files modified
data/providers/google.provider.in.in (+1/-1)
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~mardy/account-plugins/lp1252751
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-03-25
Renato Araujo Oliveira Filho (community) 2013-12-12 Approve on 2014-03-13
Alexandre Abreu 2014-03-07 Pending
Review via email: mp+198689@code.launchpad.net

Commit message

Google: request scopes needed by EDS and SyncEvolution

Description of the change

Google: request scopes needed by EDS and SyncEvolution

To post a comment you must log in.
lp:~mardy/account-plugins/lp1252751 updated on 2014-03-07
132. By Alberto Mardegan on 2014-03-07

Add Carddav scope

works nice for me.

review: Approve
lp:~mardy/account-plugins/lp1252751 updated on 2014-03-25
133. By Alberto Mardegan on 2014-03-25

Merge from trunk

[ Ken VanDine ]
* Dropped depends for signon-keyring-extension, it's only needed for
  plugins when using gnome-control-center-signon.
[ Alberto Mardegan ]
* Live: add IMAP access to scopes list This will be used by EDS. .
  (LP: #1245381)
[ Ubuntu daily release ]
* Automatic snapshot from revision 130

lp:~mardy/account-plugins/lp1252751 updated on 2014-03-25
134. By Alberto Mardegan on 2014-03-25

Build for Architecture:any.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/providers/google.provider.in.in'
2--- data/providers/google.provider.in.in 2013-06-06 13:16:51 +0000
3+++ data/providers/google.provider.in.in 2014-03-25 13:30:59 +0000
4@@ -19,7 +19,7 @@
5 <setting name="TokenPath">o/oauth2/token</setting>
6 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
7 <setting name="ResponseType">code</setting>
8- <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/']</setting>
9+ <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar','https://www.googleapis.com/auth/carddav']</setting>
10 <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
11 <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
12 <setting name="AllowedSchemes" type="as">['https','http']</setting>
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-11-26 19:08:55 +0000
16+++ debian/changelog 2014-03-25 13:30:59 +0000
17@@ -1,3 +1,9 @@
18+account-plugins (0.11+14.04.20131126.2-0ubuntu2) trusty; urgency=medium
19+
20+ * Build for Architecture:any.
21+
22+ -- Dimitri John Ledkov <xnox@ubuntu.com> Sun, 16 Mar 2014 02:08:42 +0000
23+
24 account-plugins (0.11+14.04.20131126.2-0ubuntu1) trusty; urgency=low
25
26 [ Ken VanDine ]
27
28=== modified file 'debian/control'
29--- debian/control 2013-11-25 15:09:13 +0000
30+++ debian/control 2014-03-25 13:30:59 +0000
31@@ -21,7 +21,7 @@
32 Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk
33
34 Package: libaccount-plugin-generic-oauth
35-Architecture: i386 amd64 armhf arm64
36+Architecture: any
37 Depends: ${shlibs:Depends}, ${misc:Depends},
38 signon-plugin-oauth2,
39 Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
40@@ -31,7 +31,7 @@
41 GNOME Control Center account plugins for single signon
42
43 Package: libaccount-plugin-google
44-Architecture: i386 amd64 armhf arm64
45+Architecture: any
46 Depends: ${shlibs:Depends}, ${misc:Depends},
47 signon-plugin-oauth2,
48 Replaces: account-plugin-google (<< 0.10bzr13.04.30)

Subscribers

People subscribed via source and target branches

to all changes: