Merge lp:~didrocks/unity-system-compositor/add-dirty-sleep into lp:unity-system-compositor

[Didier Roche-Tolomelli]

add a dirty sleep to workaround a race when starting unity-system-compositor from lightdm (unity-system-compositor fails on a module load error, strace workarounds it as well)

add a dirty sleep to workaround a race when starting unity-system-compositor from lightdm (unity-system-compositor fails on a module load error, strace workarounds it as well)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/20/rebuild

review: Approve (continuous-integration)

[kevin gunn (kgunn72)]

review & tested...work for me

review: Approve

[Robert Ancell (robert-ancell)]

It's a hack but if it solves the problem for now...

review: Approve

=== modified file 'debian/10-unity-system-compositor.conf'
--- debian/10-unity-system-compositor.conf	2013-06-21 03:08:48 +0000
+++ debian/10-unity-system-compositor.conf	2013-07-18 16:53:25 +0000
@@ -1,2 +1,3 @@
 [SeatDefaults]
 type=unity
+unity-compositor-command=unity-system-compositor.sleep
 
=== modified file 'debian/unity-system-compositor.install'
--- debian/unity-system-compositor.install	2013-07-18 05:44:12 +0000
+++ debian/unity-system-compositor.install	2013-07-18 16:53:25 +0000
@@ -1,2 +1,3 @@
 usr/sbin/unity-system-compositor
 debian/10-unity-system-compositor.conf /etc/lightdm/lightdm.conf.d
+debian/unity-system-compositor.sleep usr/sbin/
 
=== added file 'debian/unity-system-compositor.sleep'
--- debian/unity-system-compositor.sleep	1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor.sleep	2013-07-18 16:53:25 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+sleep .1
+/usr/sbin/unity-system-compositor $@