Merge lp:~robert-ancell/unity-webapps-googlecalendar/app-name into lp:unity-webapps-googlecalendar

Proposed by Robert Ancell on 2014-05-05
Status: Needs review
Proposed branch: lp:~robert-ancell/unity-webapps-googlecalendar/app-name
Merge into: lp:unity-webapps-googlecalendar
Diff against target: 38 lines (+6/-6)
3 files modified
GoogleCalendargooglecom.desktop (+2/-2)
debian/control (+3/-3)
manifest.json (+1/-1)
To merge this branch: bzr merge lp:~robert-ancell/unity-webapps-googlecalendar/app-name
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-05-13
Alexandre Abreu (community) 2014-05-09 Needs Fixing on 2014-05-13
Justin McPherson 2014-05-05 Approve on 2014-05-06
Review via email: mp+218243@code.launchpad.net

Description of the change

Correct name by adding in space. I'm not sure what XB-Ubuntu-Webapps-Name in debian/control is used for an if that too is a human readable name (i.e. "Google Calendar") or an ID (i.e. "GoogleCalendar").

To post a comment you must log in.
review: Approve
David Barth (dbarth) wrote :

Just verifying with Alex that that name parameter has no implication with technical paths to find the webapp supporting JS code.

Alexandre Abreu (abreu-alexandre) wrote :

You need to modify:

- the manifest.json file to update the name as well,
- the Exec line for the desktop file contains a base64 encoded string corresponding to the name,

unity-webapps-runner -n 'R29vZ2xlQ2FsZW5kYXI='

which needs to be updated too,

- you can also change the X-Ubuntu- name,

review: Needs Fixing
71. By Robert Ancell on 2014-05-13

Update manifest name

72. By Robert Ancell on 2014-05-13

Update base64 encoded name in Exec line

73. By Robert Ancell on 2014-05-13

Update XB-Ubuntu-Webapps-Name in debian/control

Unmerged revisions

73. By Robert Ancell on 2014-05-13

Update XB-Ubuntu-Webapps-Name in debian/control

72. By Robert Ancell on 2014-05-13

Update base64 encoded name in Exec line

71. By Robert Ancell on 2014-05-13

Update manifest name

70. By Robert Ancell on 2014-05-05

Correct name from GoogleCalendar to Google Calendar

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GoogleCalendargooglecom.desktop'
2--- GoogleCalendargooglecom.desktop 2014-04-08 20:56:01 +0000
3+++ GoogleCalendargooglecom.desktop 2014-05-13 20:07:48 +0000
4@@ -1,9 +1,9 @@
5 [Desktop Entry]
6-Name=GoogleCalendar
7+Name=Google Calendar
8 Type=Application
9 Icon=unity-webapps-google-calendar
10 MimeType=
11 Actions=S0;S1;S2;S3;S4;S5;S6;S7;S8;S9;S10;
12-Exec=unity-webapps-runner -n 'R29vZ2xlQ2FsZW5kYXI=' -d 'google.com' --store-session-cookies %u
13+Exec=unity-webapps-runner -n 'R29vZ2xlIENhbGVuZGFy' -d 'google.com' --store-session-cookies %u
14 StartupWMClass=GoogleCalendargooglecom
15
16\ No newline at end of file
17
18=== modified file 'debian/control'
19--- debian/control 2013-09-13 21:20:50 +0000
20+++ debian/control 2014-05-13 20:07:48 +0000
21@@ -17,7 +17,7 @@
22 xdg-utils,
23 ${misc:Depends},
24 XB-Ubuntu-Webapps-Includes: https://www.google.*/calendar/*;http://www.google.*/calendar/*
25-XB-Ubuntu-Webapps-Name: GoogleCalendar
26+XB-Ubuntu-Webapps-Name: Google Calendar
27 XB-Ubuntu-Webapps-Domain: google.com
28-Description: Unity Webapp for GoogleCalendar
29- GoogleCalendar Webapp for Unity
30+Description: Unity Webapp for Google Calendar
31+ Google Calendar Webapp for Unity
32
33=== modified file 'manifest.json'
34--- manifest.json 2014-04-08 20:56:01 +0000
35+++ manifest.json 2014-05-13 20:07:48 +0000
36@@ -1,1 +1,1 @@
37-{"includes":["https://www.google.*/calendar/*","http://www.google.*/calendar/*","https://accounts.google.*/*", "https://www.google.*/a/*"],"requires":["utils.js"],"name":"GoogleCalendar","scripts":["GoogleCalendar.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","manifest-version":"1.0","integration-version":"2.2","package-name":"GoogleCalendar","icons":{"128":"128/unity-webapps-google-calendar.png","48":"48/unity-webapps-google-calendar.png","52":"52/unity-webapps-google-calendar.png","64":"64/unity-webapps-google-calendar.png"},"domain":"google.com","homepage":"https://www.google.com/calendar/render","license":"GPL-3"}
38+{"includes":["https://www.google.*/calendar/*","http://www.google.*/calendar/*","https://accounts.google.*/*", "https://www.google.*/a/*"],"requires":["utils.js"],"name":"Google Calendar","scripts":["GoogleCalendar.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","manifest-version":"1.0","integration-version":"2.2","package-name":"GoogleCalendar","icons":{"128":"128/unity-webapps-google-calendar.png","48":"48/unity-webapps-google-calendar.png","52":"52/unity-webapps-google-calendar.png","64":"64/unity-webapps-google-calendar.png"},"domain":"google.com","homepage":"https://www.google.com/calendar/render","license":"GPL-3"}

Subscribers

People subscribed via source and target branches

to all changes: