Merge lp:~ories/ubuntu-clock-app/unity8_preview_fix into lp:ubuntu-clock-app/saucy

[Olli Ries]

Added "exec" to the script launcher to fix launching clock app in the Unity 8 Desktop Preview

as per https://bugs.launchpad.net/ubuntu/+source/unity8-desktop-session/+bug/1300911, comment #2

added "exec" to maintain same PID in order to establish connection to Mir

[Nekhelesh Ramananthan (nik90)]

I installed it on the phone using click-buddy --dir . --provision and it seems to work fine. So I can say nothing regressed. However this has to be tested on Unity 8 Desktop preview.

[Olli Ries (ories)]

I have tested U7/Desktop and U8/Desktop preview

[Michał Sawicz (saviq)]

Yes, this is fine. Means only that the qmlscene process will replace the bash PID, which is required for Unity8 to accept the connection.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~ories/ubuntu-clock-app/unity8_preview_fix/+merge/216152/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'ubuntu-clock-app.in'
--- ubuntu-clock-app.in	2014-02-04 15:02:26 +0000
+++ ubuntu-clock-app.in	2014-04-16 16:24:46 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
 export QT_SELECT=qt5
-qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@
+exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@