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

[Alberto Mardegan]

Google: request scopes needed by EDS and SyncEvolution

Google: request scopes needed by EDS and SyncEvolution

[PS Jenkins bot (ps-jenkins)]

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]

132. By Alberto Mardegan on 2014-03-07

Add Carddav scope

[PS Jenkins bot (ps-jenkins)]

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)

[Renato Araujo Oliveira Filho (renatofilho)]

works nice for me.

review: Approve

[lp:~mardy/account-plugins/lp1252751]

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

[PS Jenkins bot (ps-jenkins)]

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]

134. By Alberto Mardegan on 2014-03-25

Build for Architecture:any.

[PS Jenkins bot (ps-jenkins)]

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)

=== 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 @@
           <setting name="TokenPath">o/oauth2/token</setting>
           <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
           <setting name="ResponseType">code</setting>
-          <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>
+          <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>
           <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
           <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>

=== 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 @@
+account-plugins (0.11+14.04.20131126.2-0ubuntu2) trusty; urgency=medium
+
+  * Build for Architecture:any.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sun, 16 Mar 2014 02:08:42 +0000
+
 account-plugins (0.11+14.04.20131126.2-0ubuntu1) trusty; urgency=low
 
   [ Ken VanDine ]

=== 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 @@
 Vcs-Bzr: https://code.launchpad.net/~online-accounts/account-plugins/trunk
 
 Package: libaccount-plugin-generic-oauth
-Architecture: i386 amd64 armhf arm64
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
          signon-plugin-oauth2,
 Replaces: account-plugin-generic-oauth (<< 0.10bzr13.04.30)
@@ -31,7 +31,7 @@
  GNOME Control Center account plugins for single signon
 
 Package: libaccount-plugin-google
-Architecture: i386 amd64 armhf arm64
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
          signon-plugin-oauth2,
 Replaces: account-plugin-google (<< 0.10bzr13.04.30)