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

[Robert Ancell]

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").

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/unity-webapps-googlecalendar-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-googlecalendar-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-googlecalendar-trusty-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-googlecalendar-ci/8/rebuild

review: Approve (continuous-integration)

[Justin McPherson (justinmcp)]

review: Approve

[David Barth (dbarth)]

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)]

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

[lp:~robert-ancell/unity-webapps-googlecalendar/app-name]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/unity-webapps-googlecalendar-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-googlecalendar-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-googlecalendar-utopic-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-googlecalendar-ci/9/rebuild

review: Approve (continuous-integration)

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

=== modified file 'GoogleCalendargooglecom.desktop'
--- GoogleCalendargooglecom.desktop	2014-04-08 20:56:01 +0000
+++ GoogleCalendargooglecom.desktop	2014-05-13 20:07:48 +0000
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=GoogleCalendar
+Name=Google Calendar
 Type=Application
 Icon=unity-webapps-google-calendar
 MimeType=
 Actions=S0;S1;S2;S3;S4;S5;S6;S7;S8;S9;S10;
-Exec=unity-webapps-runner -n 'R29vZ2xlQ2FsZW5kYXI=' -d 'google.com' --store-session-cookies %u
+Exec=unity-webapps-runner -n 'R29vZ2xlIENhbGVuZGFy' -d 'google.com' --store-session-cookies %u
 StartupWMClass=GoogleCalendargooglecom
     
 \ No newline at end of file
 
=== modified file 'debian/control'
--- debian/control	2013-09-13 21:20:50 +0000
+++ debian/control	2014-05-13 20:07:48 +0000
@@ -17,7 +17,7 @@
          xdg-utils,
          ${misc:Depends},
 XB-Ubuntu-Webapps-Includes: https://www.google.*/calendar/*;http://www.google.*/calendar/*
-XB-Ubuntu-Webapps-Name: GoogleCalendar
+XB-Ubuntu-Webapps-Name: Google Calendar
 XB-Ubuntu-Webapps-Domain: google.com
-Description: Unity Webapp for GoogleCalendar
- GoogleCalendar Webapp for Unity
+Description: Unity Webapp for Google Calendar
+ Google Calendar Webapp for Unity
 
=== modified file 'manifest.json'
--- manifest.json	2014-04-08 20:56:01 +0000
+++ manifest.json	2014-05-13 20:07:48 +0000
@@ -1,1 +1,1 @@
-{"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 <[e-mail]>","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"}
+{"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 <[e-mail]>","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"}