Merge lp:~ricmm/ubuntu-touch-session/platform-api-v2 into lp:ubuntu-touch-session

[Ricardo Mendoza]

Platform API Config

[lp:~ricmm/ubuntu-touch-session/platform-api-v2]

182. By Ricardo Mendoza on 2014-06-02

Merge trunk

183. By Ricardo Mendoza on 2014-06-04

Add platform-api backend override for unity8 touch session

184. By Ricardo Mendoza on 2014-06-04

Override greeter platform-api backend for mirserver

[Michael Terry (mterry)]

We talked on IRC about this. If we can avoid the .override method, it'd be better (hard if any other package ever also wants to do a similar thing since we can only have one override file).

And the ubuntu-touch-session file is also used for the greeter session's upstart instance, where we don't want to set this var. So a more targeted approach is needed there.

We were thinking of using similar logic to unity8's ubuntumirclient->ubuntumirserver promotion logic in unity-mir.

[lp:~ricmm/ubuntu-touch-session/platform-api-v2]

185. By Ricardo Mendoza on 2014-06-10

Revert overrides for Unity8s Platform API backend

=== modified file 'debian/ubuntu-touch-session.install'
--- debian/ubuntu-touch-session.install	2014-06-03 14:31:27 +0000
+++ debian/ubuntu-touch-session.install	2014-06-10 21:16:23 +0000
@@ -9,4 +9,5 @@
 ubuntu-touch.desktop /usr/share/lightdm/sessions
 52-ubuntu-touch.conf /usr/share/lightdm/lightdm.conf.d
 usc-wrapper /usr/share/ubuntu-touch-session/
+platform-api/application.conf /etc/ubuntu-platform-api/
 com.ubuntu.touch.NetworkManager.pkla /var/lib/polkit-1/localauthority/10-vendor.d/

=== added directory 'platform-api'
=== added file 'platform-api/application.conf'
--- platform-api/application.conf	1970-01-01 00:00:00 +0000
+++ platform-api/application.conf	2014-06-10 21:16:23 +0000
@@ -0,0 +1,1 @@
+touch_mirclient