Merge lp:~mterry/ubuntu-touch-session/split into lp:ubuntu-touch-session

[Michael Terry]

Enable split mode by depending on unity8-greeter and making relevant configuration changes, like enabling the spinner for USC.

Enable split mode by depending on unity8-greeter and making relevant configuration changes, like enabling the spinner for USC.

This shouldn't land until ~mterry/unity8/split does.

[lp:~mterry/ubuntu-touch-session/split]

173. By Michael Terry on 2014-03-21

Let lightdm talk to ofono, for unlocking SIM card

174. By Michael Terry on 2014-04-03

Merge from trunk

175. By Michael Terry on 2014-04-07

Merge from trunk

176. By Michael Terry on 2014-05-05

Drop spinner and power off delay for now

177. By Michael Terry on 2014-05-07

Add back power off delay

178. By Michael Terry on 2014-05-12

Merge from trunk

[Oliver Grawert (ogra)]

looks fine

review: Approve

[lp:~mterry/ubuntu-touch-session/split]

179. By Michael Terry on 2014-05-29

Depend on latest functionality in USC for handling two sessions

=== modified file '52-ubuntu-touch.conf'
--- 52-ubuntu-touch.conf	2014-03-28 12:29:40 +0000
+++ 52-ubuntu-touch.conf	2014-05-29 08:07:37 +0000
@@ -2,6 +2,7 @@
 type=unity
 user-session=ubuntu-touch
 unity-compositor-command=/usr/share/ubuntu-touch-session/usc-wrapper
+autologin-in-background=true
 
 [LightDM]
 minimum-vt=1
 
=== added file 'com.ubuntu.touch.NetworkManager.pkla'
--- com.ubuntu.touch.NetworkManager.pkla	1970-01-01 00:00:00 +0000
+++ com.ubuntu.touch.NetworkManager.pkla	2014-05-29 08:07:37 +0000
@@ -0,0 +1,15 @@
+# This next block is actually a duplicate from livecd-rootfs.  Once this lands
+# in the image, we can remove the duplicate bits from livecd-rootfs.
+[sudo-network-rights]
+Identity=unix-group:sudo
+Action=org.freedesktop.NetworkManager.*
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
+
+[lightdm-network-rights]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.*
+ResultAny=no
+ResultInactive=no
+ResultActive=yes
 
=== modified file 'debian/control'
--- debian/control	2014-04-02 11:11:44 +0000
+++ debian/control	2014-05-29 08:07:37 +0000
@@ -12,7 +12,8 @@
 Package: ubuntu-touch-session
 Architecture: all
 Depends: lightdm (>= 1.9.5),
-         unity-system-compositor (>= 0.0.2),
+         unity-system-compositor (>= 0.0.3),
+         unity8-greeter,
          upstart-app-launch (>= 0.1+13.10.20130923.4-0ubuntu1~),
          ${misc:Depends},
          ${shlibs:Depends},
 
=== modified file 'debian/ubuntu-touch-session.install'
--- debian/ubuntu-touch-session.install	2014-05-02 15:21:11 +0000
+++ debian/ubuntu-touch-session.install	2014-05-29 08:07:37 +0000
@@ -8,3 +8,4 @@
 ubuntu-touch.desktop /usr/share/lightdm/sessions
 52-ubuntu-touch.conf /usr/share/lightdm/lightdm.conf.d
 usc-wrapper /usr/share/ubuntu-touch-session/
+com.ubuntu.touch.NetworkManager.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
 
=== modified file 'etc/dbus-1/system.d/ofono-phablet.conf'
--- etc/dbus-1/system.d/ofono-phablet.conf	2012-11-28 14:41:03 +0000
+++ etc/dbus-1/system.d/ofono-phablet.conf	2014-05-29 08:07:37 +0000
@@ -5,4 +5,7 @@
 	<policy user="phablet">
 		<allow send_destination="org.ofono"/>
 	</policy>
+	<policy user="lightdm">
+		<allow send_destination="org.ofono"/>
+	</policy>
 </busconfig>
 
=== modified file 'usc-wrapper'
--- usc-wrapper	2014-03-28 12:28:12 +0000
+++ usc-wrapper	2014-05-29 08:07:37 +0000
@@ -5,4 +5,4 @@
 . /etc/environment
 export ANDROID_ROOT
 
-exec unity-system-compositor $@
+exec unity-system-compositor --power-off-delay=500 $@