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

Proposed by Ken VanDine on 2013-08-01
Status: Merged
Approved by: Alberto Mardegan on 2013-08-01
Approved revision: 127
Merged at revision: 127
Proposed branch: lp:~ken-vandine/account-plugins/gdrive_fix
Merge into: lp:account-plugins
Diff against target: 70 lines (+3/-32)
4 files modified
Makefile.am (+1/-1)
data/services/Makefile.am (+0/-29)
data/services/google-drive.service.in (+1/-1)
debian/account-plugin-google.install (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/account-plugins/gdrive_fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-08-01
Alberto Mardegan (community) 2013-08-01 Approve on 2013-08-01
Review via email: mp+178084@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

Thanks!

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-06-27 14:17:22 +0000
3+++ Makefile.am 2013-08-01 14:37:35 +0000
4@@ -87,7 +87,7 @@
5 data/services/flickr-microblog.service.in \
6 data/services/flickr-sharing.service.in \
7 data/services/foursquare-microblog.service.in \
8- data/services/google-docs.service.in \
9+ data/services/google-drive.service.in \
10 data/services/google-im.service.in \
11 data/services/identica-microblog.service.in \
12 data/services/linkedin-microblog.service.in \
13
14=== removed file 'data/services/Makefile.am'
15--- data/services/Makefile.am 2013-06-27 14:17:22 +0000
16+++ data/services/Makefile.am 1970-01-01 00:00:00 +0000
17@@ -1,29 +0,0 @@
18-# Extract translatable strings from .service files
19-%.service: %.service.in $(INTLTOOL_MERGE)
20- $(INTLTOOL_V_MERGE) LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_MERGE_V_OPTIONS) --no-translations -x -u $< $@
21-
22-services_in_files = \
23- facebook-contacts.service.in \
24- facebook-im.service.in \
25- facebook-microblog.service.in \
26- facebook-sharing.service.in \
27- flickr-microblog.service.in \
28- flickr-sharing.service.in \
29- foursquare-microblog.service.in \
30- google-docs.service.in \
31- google-im.service.in \
32- identica-microblog.service.in \
33- picasa.service.in \
34- sina-microblog.service.in \
35- sohu-microblog.service.in \
36- twitter-microblog.service.in \
37- wlm.service.in
38-
39-services_DATA = \
40- $(services_in_files:.service.in=.service)
41-
42-dist_noinst_DATA = \
43- $(services_in_files)
44-
45-CLEANFILES = \
46- $(services_DATA)
47
48=== renamed file 'data/services/google-docs.service.in' => 'data/services/google-drive.service.in'
49--- data/services/google-docs.service.in 2012-10-04 14:18:34 +0000
50+++ data/services/google-drive.service.in 2013-08-01 14:37:35 +0000
51@@ -1,7 +1,7 @@
52 <?xml version="1.0" encoding="UTF-8" ?>
53 <service id="service">
54 <type>documents</type>
55- <name>GoogleDocs</name>
56+ <name>GoogleDrive</name>
57 <icon>icon_google_docs</icon>
58 <provider>google</provider>
59 <translations>account-plugins</translations>
60
61=== modified file 'debian/account-plugin-google.install'
62--- debian/account-plugin-google.install 2013-06-07 11:56:25 +0000
63+++ debian/account-plugin-google.install 2013-08-01 14:37:35 +0000
64@@ -1,5 +1,5 @@
65 etc/signon-ui/webkit-options.d/accounts.google.com.conf
66-usr/share/accounts/services/google-docs.service
67+usr/share/accounts/services/google-drive.service
68 usr/share/accounts/services/google-im.service
69 usr/share/accounts/services/picasa.service
70 usr/share/accounts/providers/google.provider

Subscribers

People subscribed via source and target branches

to all changes: