Merge lp:~cimi/unity-mir/unity-mir.stop-server_wizard into lp:unity-mir

[Andrea Cimitan]

Stop the server when the client app quits.
Add check for upstart session of ubuntu-system-settings-wizard

Stop the server when the client app quits.
Add check for upstart session of ubuntu-system-settings-wizard

 Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~cimi/unity8/unity8.upstart_unity-mir_variables/+merge/215152
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity-mir/unity-mir.stop-server_wizard/+merge/214983/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/313/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/176

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/313/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity-mir/unity-mir.stop-server_wizard]

211. By Andrea Cimitan on 2014-04-09

Use env var instead checking for upstart job

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:211
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/unity-mir/unity-mir.stop-server_wizard/+merge/214983/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/177

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/314/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

UNITY_MIR_EXPECTS_SIGSTOP - expects? Maybe "emits"?

Please attach the checklist:
https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

review: Needs Fixing

[lp:~cimi/unity-mir/unity-mir.stop-server_wizard]

212. By Andrea Cimitan on 2014-04-16

Rename variable

213. By Andrea Cimitan on 2014-04-16

[ Michael Zanetti ]
* send a SIGTERM to the process if upstart fails to stop an
  application (LP: #1273781)
[ Ubuntu daily release ]
* New rebuild forced
[ Alan Griffiths ]
* Compatibility with Mir 0.1.8
[ Gerry Boland ]
* Mir 0.1.8 refactoring allows removal of custom SurfaceFactory and
  instead use InitialSurfacePlacementStrategy to set surface depth and
  other properties. The shell surface notification now comes via
  SessionListener

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/186
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/185

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/322/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/323/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/187
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/186

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/323/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Yes.

review: Approve

[Michał Sawicz (saviq)]

We need to bump the version number here:

# unity-mir
$ dch -v 0.4-0ubuntu1

# unity8
$ dch -v 7.86-0ubuntu1

And add:

# to libunity-mir1
Breaks: unity8 (<< 7.86)

# to unity8 for libunity-mir1 depenedency
(>= 0.4)

review: Needs Fixing

[lp:~cimi/unity-mir/unity-mir.stop-server_wizard]

214. By Andrea Cimitan on 2014-04-29

Updated packaging

[Michał Sawicz (saviq)]

UNRELEASED, not utopic, please.

review: Needs Fixing

[lp:~cimi/unity-mir/unity-mir.stop-server_wizard]

215. By Andrea Cimitan on 2014-04-29

unreleased

216. By Andrea Cimitan on 2014-04-29

merged trunk

[Michał Sawicz (saviq)]

review: Abstain

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 07:04:52 +0000
+++ debian/changelog	2014-04-29 10:20:34 +0000
@@ -1,3 +1,10 @@
+unity-mir (0.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Andrea Cimitan ]
+  * Update upstart integration and support welcome wizard
+
+ -- Andrea Cimitan <[e-mail]>  Tue, 29 Apr 2014 09:29:52 +0100
+
 unity-mir (0.3+14.04.20140417-0ubuntu1) trusty; urgency=low
 
   [ Ted Gould ]

=== modified file 'debian/control'
--- debian/control	2014-04-08 07:50:59 +0000
+++ debian/control	2014-04-29 10:20:34 +0000
@@ -33,6 +33,7 @@
          ${shlibs:Depends},
 Replaces: unity-mir,
 Conflicts: unity-mir,
+Breaks: unity8 (<< 7.86)
 Provides: unity-mir,
           unity-application-impl,
           unity-application-impl-2,

=== modified file 'src/unity-mir/qmirserver.cpp' (properties changed: -x to +x)
--- src/unity-mir/qmirserver.cpp	2014-03-06 01:00:29 +0000
+++ src/unity-mir/qmirserver.cpp	2014-04-29 10:20:34 +0000
@@ -18,6 +18,7 @@
 #include <mir/run_mir.h>
 #include <mir/abnormal_exit.h>
 #include <mir/default_server_configuration.h>
+#include <mir/display_server.h>
 
 // Platform API
 #include <application/ubuntu_application_api_mirserver_priv.h>
@@ -53,11 +54,14 @@
     auto config = new ShellServerConfiguration(m_argc, m_argv);
     std::thread *t;
 
-    mir::run_mir(*config, [config, &client, &argc, &argv, &t](mir::DisplayServer&) {
+    mir::run_mir(*config, [config, &client, &argc, &argv, &t](mir::DisplayServer& server) {
         ua_ui_mirserver_init(*config);
 
         try {
-            t = new std::thread(client, argc, argv, config);
+            t = new std::thread([&]() {
+                client (argc, argv, config);
+                server.stop();
+            });
         } catch (...) {
             qDebug() << "Exception caught, quitting";
         }

=== modified file 'src/unity-mir/serverstatuslistener.cpp' (properties changed: -x to +x)
--- src/unity-mir/serverstatuslistener.cpp	2013-10-16 12:33:58 +0000
+++ src/unity-mir/serverstatuslistener.cpp	2014-04-29 10:20:34 +0000
@@ -39,7 +39,7 @@
     // FIXME: should not be unity-mir's job, instead should notify the user of this library
     // that they should emit this signal, perhaps by posting an event to the
     // QMirServerApplication event loop when it comes up
-    if (qgetenv("UPSTART_JOB") == "unity8") {
+    if (qgetenv("UNITY_MIR_EMITS_SIGSTOP") == "1") {
         raise(SIGSTOP);
     }
 }