Merge lp:~ogra/mtp/fix-packaging into lp:mtp

[Oliver Grawert]

Fix the installation of the mtp-state.conf upstart job file

Fix the installation of the mtp-state.conf upstart job file

[lp:~ogra/mtp/fix-packaging]

41. By Oliver Grawert on 2014-03-07

fix packaging and install the mtp-state upstart job

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:41
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/~ogra/mtp/fix-packaging/+merge/209997/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mtp-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-trusty-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/mtp-trusty-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-trusty-i386-ci/4

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

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, thanks.

review: Approve

=== renamed file 'debian/mtp-state.conf' => 'debian/mtp-server.mtp-state.upstart'
=== modified file 'debian/rules'
--- debian/rules	2013-09-12 14:47:10 +0000
+++ debian/rules	2014-03-07 19:11:43 +0000
@@ -9,6 +9,6 @@
 	dh $@ -- --fail-missing
 
 override_dh_installinit:
-	dh_installinit -pmtp-server --name=mtp-server-bootup --no-start -r -n
+	dh_installinit -pmtp-server --name=mtp-state --no-start -r -n
 	dh_installinit