Merge lp:~ogra/powerd/fix-semsor-race into lp:powerd

[Oliver Grawert]

fix race with proximity sensor on boot

fix race with proximity sensor on boot

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/powerd-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/61/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/107/rebuild

review: Approve (continuous-integration)

[Seth Forshee (sforshee)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-12 18:41:26 +0000
+++ debian/changelog	2013-08-14 11:09:41 +0000
@@ -1,3 +1,12 @@
+powerd (0.13+13.10.20130812-0ubuntu2) UNRELEASED; urgency=low
+
+  * fix race condition on boot, we need to wait until the proximity sensor is
+    available before starting, the container emits an "android" event once it
+    is done bootimg ... make the upstart job wait for this event so we can be
+    sure the sensorservice is available on the android side
+
+ -- Oliver Grawert <[e-mail]>  Wed, 14 Aug 2013 13:04:36 +0200
+
 powerd (0.13+13.10.20130812-0ubuntu1) saucy; urgency=low
 
   [ Seth Forshee ]

=== modified file 'debian/upstart'
--- debian/upstart	2013-07-11 14:37:52 +0000
+++ debian/upstart	2013-08-14 11:09:41 +0000
@@ -1,6 +1,6 @@
 author "Michael Frey <[e-mail]>"
 
-start on started dbus
+start on started dbus and android
 
 respawn