Merge lp:~ken-vandine/account-plugins/gdrive_fix into lp:account-plugins

[Ken VanDine]

Rename the google-docs service to google-drive to match branding. The gdrive
scope was changed to use google-drive already, which is currently broken.

Rename the google-docs service to google-drive to match branding. The gdrive
scope was changed to use google-drive already, which is currently broken.

[Alberto Mardegan (mardy)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Makefile.am'
--- Makefile.am	2013-06-27 14:17:22 +0000
+++ Makefile.am	2013-08-01 14:37:35 +0000
@@ -87,7 +87,7 @@
 	data/services/flickr-microblog.service.in \
 	data/services/flickr-sharing.service.in \
 	data/services/foursquare-microblog.service.in \
-	data/services/google-docs.service.in \
+	data/services/google-drive.service.in \
 	data/services/google-im.service.in \
 	data/services/identica-microblog.service.in \
 	data/services/linkedin-microblog.service.in \
 
=== removed file 'data/services/Makefile.am'
--- data/services/Makefile.am	2013-06-27 14:17:22 +0000
+++ data/services/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Extract translatable strings from .service files
-%.service: %.service.in $(INTLTOOL_MERGE)
-	$(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
-
-services_in_files = \
-	facebook-contacts.service.in \
-	facebook-im.service.in \
-	facebook-microblog.service.in \
-	facebook-sharing.service.in \
-	flickr-microblog.service.in \
-	flickr-sharing.service.in \
-	foursquare-microblog.service.in \
-	google-docs.service.in \
-	google-im.service.in \
-	identica-microblog.service.in \
-	picasa.service.in \
-	sina-microblog.service.in \
-	sohu-microblog.service.in \
-	twitter-microblog.service.in \
-	wlm.service.in
-
-services_DATA = \
-	$(services_in_files:.service.in=.service)
-
-dist_noinst_DATA = \
-	$(services_in_files)
-
-CLEANFILES = \
-	$(services_DATA)
 
=== renamed file 'data/services/google-docs.service.in' => 'data/services/google-drive.service.in'
--- data/services/google-docs.service.in	2012-10-04 14:18:34 +0000
+++ data/services/google-drive.service.in	2013-08-01 14:37:35 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <service id="service">
   <type>documents</type>
-  <name>GoogleDocs</name>
+  <name>GoogleDrive</name>
   <icon>icon_google_docs</icon>
   <provider>google</provider>
   <translations>account-plugins</translations>
 
=== modified file 'debian/account-plugin-google.install'
--- debian/account-plugin-google.install	2013-06-07 11:56:25 +0000
+++ debian/account-plugin-google.install	2013-08-01 14:37:35 +0000
@@ -1,5 +1,5 @@
 etc/signon-ui/webkit-options.d/accounts.google.com.conf
-usr/share/accounts/services/google-docs.service
+usr/share/accounts/services/google-drive.service
 usr/share/accounts/services/google-im.service
 usr/share/accounts/services/picasa.service
 usr/share/accounts/providers/google.provider