Merge lp:~stgraber/mtp/upstart-fixes into lp:mtp

[Stéphane Graber]

Fix some upstart issues.

Fix some upstart issues.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/mtp-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mtp-saucy-amd64-ci/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mtp-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[Loïc Minier (lool)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/mtp-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mtp-ci/9/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mtp-autolanding/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-amd64-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-autolanding/5/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mtp-saucy-i386-autolanding/5/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

looks good

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-18 14:38:45 +0000
+++ debian/changelog	2013-09-25 19:41:58 +0000
@@ -1,3 +1,12 @@
+mtp (0.0.1+13.10.20130918-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fix upstart jobs. The system job was marked as task but wasn't a
+    task and was therefore keeping lxc-android-config in post-start. The
+    user job was working fine, but was backgrounding the process on the exec
+    line instead of just letting upstart track it directly.
+
+ -- Stéphane Graber <[e-mail]>  Wed, 25 Sep 2013 15:39:21 -0400
+
 mtp (0.0.1+13.10.20130918-0ubuntu1) saucy; urgency=low
 
   [ Oliver Grawert ]
 
=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2013-09-10 15:55:18 +0000
+++ debian/mtp-server.conf	2013-09-25 19:41:58 +0000
@@ -2,7 +2,6 @@
 
 start on :sys:android_usb-device-changed
 
-expect fork
 respawn
 
 pre-start script
@@ -15,4 +14,4 @@
 	rm -f ~/.cache/upstart/mtp-server.log
 end script
 
-exec /usr/bin/mtp-server &
+exec /usr/bin/mtp-server
 
=== modified file 'debian/mtp-server.mtp-server-bootup.upstart'
--- debian/mtp-server.mtp-server-bootup.upstart	2013-09-18 14:08:04 +0000
+++ debian/mtp-server.mtp-server-bootup.upstart	2013-09-25 19:41:58 +0000
@@ -3,8 +3,6 @@
 start on android
 stop on runlevel [06]
 
-task
-
 emits android_usb-device-changed
 
 pre-start script