Merge lp:~pete-woods/account-plugins/google-youtube into lp:account-plugins

[Pete Woods]

Google: Add Youtube service

Add the Youtube service to enable the newly written Youtube scope to access Youtube accounts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/account-plugins-utopic-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/30/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

As discussed in IRC, the service file will be shipped by the youtube scope.

review: Disapprove

Unmerged revisions

139. By Pete Woods on 2014-07-01

Google: Add Youtube service

=== modified file 'Makefile.am'
--- Makefile.am	2014-03-31 08:21:46 +0000
+++ Makefile.am	2014-07-01 10:39:24 +0000
@@ -89,6 +89,7 @@
 	data/services/foursquare-microblog.service.in \
 	data/services/google-drive.service.in \
 	data/services/google-im.service.in \
+	data/services/google-youtube.service.in \
 	data/services/identica-microblog.service.in \
 	data/services/linkedin-microblog.service.in \
 	data/services/instagram-microblog.service.in \
 
=== modified file 'data/providers/google.provider.in.in'
--- data/providers/google.provider.in.in	2014-03-07 15:03:19 +0000
+++ data/providers/google.provider.in.in	2014-07-01 10:39:24 +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/','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="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','https://www.googleapis.com/auth/youtube']</setting>
           <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
           <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
           <setting name="AllowedSchemes" type="as">['https','http']</setting>
 
=== added file 'data/services/google-youtube.service.in'
--- data/services/google-youtube.service.in	1970-01-01 00:00:00 +0000
+++ data/services/google-youtube.service.in	2014-07-01 10:39:24 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="google-youtube">
+  <type>sharing</type>
+  <name>Youtube</name>
+  <icon>youtube</icon>
+  <provider>google</provider>
+  <translations>account-plugins</translations>
+</service>
+
 
=== modified file 'debian/account-plugin-google.install'
--- debian/account-plugin-google.install	2013-08-01 14:34:21 +0000
+++ debian/account-plugin-google.install	2014-07-01 10:39:24 +0000
@@ -1,6 +1,7 @@
 etc/signon-ui/webkit-options.d/accounts.google.com.conf
 usr/share/accounts/services/google-drive.service
 usr/share/accounts/services/google-im.service
+usr/share/accounts/services/google-youtube.service
 usr/share/accounts/services/picasa.service
 usr/share/accounts/providers/google.provider
 usr/share/accounts/qml-plugins/google/Main.qml