Online Accounts: Account plugins

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

  1. lp1252751
  2. Merge into trunk
Proposed by Alberto Mardegan
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
Renato Araujo Oliveira Filho (community) Approve
Alexandre Abreu 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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:131
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/19/rebuild

review: Approve (continuous-integration)
lp:~mardy/account-plugins/lp1252751 updated
132. By Alberto Mardegan

Add Carddav scope

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:132
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

works nice for me.

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

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/21/rebuild

review: Approve (continuous-integration)
lp:~mardy/account-plugins/lp1252751 updated
134. By Alberto Mardegan

Build for Architecture:any.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-plugins-ci/22/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/providers/google.provider.in.in'
--- data/providers/google.provider.in.in 2013-06-06 13:16:51 +0000
+++ data/providers/google.provider.in.in 2014-03-25 13:30:59 +0000
@@ -19,7 +19,7 @@
19 <setting name="TokenPath">o/oauth2/token</setting>19 <setting name="TokenPath">o/oauth2/token</setting>
20 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>20 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
21 <setting name="ResponseType">code</setting>21 <setting name="ResponseType">code</setting>
22 <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>22 <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>
23 <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>23 <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
24 <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>24 <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
25 <setting name="AllowedSchemes" type="as">['https','http']</setting>25 <setting name="AllowedSchemes" type="as">['https','http']</setting>
2626
=== modified file 'debian/changelog'
--- debian/changelog 2013-11-26 19:08:55 +0000
+++ debian/changelog 2014-03-25 13:30:59 +0000
@@ -1,3 +1,9 @@
1account-plugins (0.11+14.04.20131126.2-0ubuntu2) trusty; urgency=medium
2
3 * Build for Architecture:any.
4
5 -- Dimitri John Ledkov <xnox@ubuntu.com> Sun, 16 Mar 2014 02:08:42 +0000
6
1account-plugins (0.11+14.04.20131126.2-0ubuntu1) trusty; urgency=low7account-plugins (0.11+14.04.20131126.2-0ubuntu1) trusty; urgency=low
28
3 [ Ken VanDine ]9 [ Ken VanDine ]
410
=== modified file 'debian/control'
--- debian/control 2013-11-25 15:09:13 +0000
+++ debian/control 2014-03-25 13:30:59 +0000
@@ -21,7 +21,7 @@
21Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk21Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk
2222
23Package: libaccount-plugin-generic-oauth23Package: libaccount-plugin-generic-oauth
24Architecture: i386 amd64 armhf arm6424Architecture: any
25Depends: ${shlibs:Depends}, ${misc:Depends},25Depends: ${shlibs:Depends}, ${misc:Depends},
26 signon-plugin-oauth2,26 signon-plugin-oauth2,
27Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)27Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
@@ -31,7 +31,7 @@
31 GNOME Control Center account plugins for single signon31 GNOME Control Center account plugins for single signon
3232
33Package: libaccount-plugin-google33Package: libaccount-plugin-google
34Architecture: i386 amd64 armhf arm6434Architecture: any
35Depends: ${shlibs:Depends}, ${misc:Depends},35Depends: ${shlibs:Depends}, ${misc:Depends},
36 signon-plugin-oauth2,36 signon-plugin-oauth2,
37Replaces: account-plugin-google (<< 0.10bzr13.04.30)37Replaces: account-plugin-google (<< 0.10bzr13.04.30)

Subscribers

People subscribed via source and target branches