=== modified file 'debian/changelog'
--- debian/changelog	2015-03-11 19:36:38 +0000
+++ debian/changelog	2015-03-11 20:58:35 +0000
@@ -1,5 +1,12 @@
+mtp (0.0.4+15.04.20150219-0ubuntu3) UNRELEASED; urgency=medium
+
+  * fix the upstart job of mtp-server to make it start again
+  * drop all mtp-state handling, we start/stop the server directly from udev
+    events via the usb-service shipped in lxc-android-config now
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 11 Mar 2015 13:34:14 +0100
+
 mtp (0.0.4+15.04.20150219-0ubuntu2) vivid; urgency=medium
-
   * Properly fixing the startup script, as the previous change broke
     mtp on ubuntu touch completely
 

=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2015-03-11 19:35:22 +0000
+++ debian/mtp-server.conf	2015-03-11 20:58:35 +0000
@@ -1,7 +1,7 @@
 description "MTP protocol server"
 
-start on :sys:android-usb-connected or android-usb-connected or :sys:android-mtp-on or android-mtp-on or started unity8
-stop on :sys:android-usb-disconnected or android-usb-disconnected or :sys:android-mtp-off or android-mtp-off or desktop-end
+start on :sys:android-usb-connected or android-usb-connected or started unity8
+stop on :sys:android-usb-disconnected or android-usb-disconnected or desktop-end
 
 pre-start script
     [ "$USER" != "lightdm" ] || { stop; exit 0; }

=== modified file 'debian/mtp-server.install'
--- debian/mtp-server.install	2015-01-20 00:54:30 +0000
+++ debian/mtp-server.install	2015-03-11 20:58:35 +0000
@@ -1,4 +1,3 @@
 usr/bin/mtp-server
 usr/share/locale
 debian/mtp-server.conf /usr/share/upstart/sessions/
-debian/mtp-state.conf /usr/share/upstart/sessions/

=== removed file 'debian/mtp-server.mtp-state.upstart'
--- debian/mtp-server.mtp-state.upstart	2014-03-07 19:11:20 +0000
+++ debian/mtp-server.mtp-state.upstart	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-start on android-container persist.sys.usb.config=* and started lightdm
-
-task
-
-emits android-mtp-on
-emits android-mtp-off
-
-script
- VAL=$(env | grep  persist.sys.usb.config=)
- case ${VAL##*=} in
-   mtp*)
-     /sbin/initctl emit android-mtp-on
-     ;;
-   *)
-     /sbin/initctl emit android-mtp-off
-    ;;
- esac
-end script

=== modified file 'debian/rules'
--- debian/rules	2015-01-20 00:54:30 +0000
+++ debian/rules	2015-03-11 20:58:35 +0000
@@ -7,11 +7,3 @@
 
 %:
 	dh $@ --with translations -- --fail-missing
-
-override_dh_installinit:
-	dh_installinit -pmtp-server --name=mtp-state --no-start -r -n
-	dh_installinit
-
-override_dh_install:
-	cp debian/mtp-server.mtp-state.upstart debian/mtp-state.conf
-	dh_install