Merge lp:~saviq/ubuntu-touch-session/drop-unity8 into lp:ubuntu-touch-session

[Michał Sawicz]

Drop unity8.conf, to be shipped by unity8 itself.

/!\ Depends on lp:~veebers/unity8/ap_launch_unity_with_upstart. /!\

[lp:~saviq/ubuntu-touch-session/drop-unity8]

126. By Michał Sawicz on 2013-10-14

Tweak.

127. By Michał Sawicz on 2013-10-14

ogra++

128. By Michał Sawicz on 2013-10-14

Drop the 12s sleep.

129. By Michał Sawicz on 2013-10-14

Bump version, Breaks unity8 and drop Conflicts qml-phone-shell.

130. By Michał Sawicz on 2013-10-15

Tweak description.

131. By Michał Sawicz on 2013-10-15

Don't wait on unity8.

132. By Michał Sawicz on 2013-10-15

started--

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-12 19:14:43 +0000
+++ debian/changelog	2013-10-15 09:05:24 +0000
@@ -1,3 +1,10 @@
+ubuntu-touch-session (0.82) saucy; urgency=low
+
+  * Break unity8 << 7.83~.
+  * Drop qml-phone-shell conflict.
+
+ -- Michał Sawicz <[e-mail]>  Tue, 15 Oct 2013 01:15:44 +0200
+
 ubuntu-touch-session (0.81) saucy; urgency=low
 
   * Make the pulseaudio job 'expect daemon', without which the session init

=== modified file 'debian/control'
--- debian/control	2013-09-24 14:00:02 +0000
+++ debian/control	2013-10-15 09:05:24 +0000
@@ -12,7 +12,7 @@
          ${misc:Depends},
          lightdm,
          upstart-app-launch (>= 0.1+13.10.20130923.4-0ubuntu1~),
-Conflicts: qml-phone-shell (<< 7.80~)
+Breaks: unity8 (<< 7.83~)
 Description: Ubuntu Session Manager for Ubuntu Touch Devices
  The ubuntu-touch-session tool aims to setup a very simple session
  manager for the ubuntu-touch mobile shell.

=== added file 'upstart-session/ofono-setup.conf'
--- upstart-session/ofono-setup.conf	1970-01-01 00:00:00 +0000
+++ upstart-session/ofono-setup.conf	2013-10-15 09:05:24 +0000
@@ -0,0 +1,7 @@
+description "Setup oFono when unity8 starts"
+author "Oliver Grawert <[e-mail]>"
+
+start on desktop-start
+stop on desktop-end
+
+exec /usr/bin/ofono-setup

=== removed file 'upstart-session/unity8.conf'
--- upstart-session/unity8.conf	2013-09-23 19:09:17 +0000
+++ upstart-session/unity8.conf	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-description "Unity Shell v8"
-author "Ricardo Mendoza <[e-mail]>"
-
-start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
-stop on desktop-end
-
-respawn
-
-post-start script
-    sleep 12
-    /usr/bin/ofono-setup
-end script
-
-script 
-    sleep 2
-    exec unity8
-end script