Ubuntu Touch session manager

Merge lp:~mzanetti/ubuntu-touch-session/drop-sf-support into lp:ubuntu-touch-session

  1. drop-sf-support
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: 173
Merged at revision: 169
Proposed branch: lp:~mzanetti/ubuntu-touch-session/drop-sf-support
Merge into: lp:ubuntu-touch-session
Diff against target: 81 lines (+10/-18)
6 files modified
52-ubuntu-touch.conf (+1/-1)
debian/changelog (+6/-0)
debian/control (+1/-1)
etc/profile.d/qpa_plugin.sh (+1/-5)
ubuntu-touch-session (+1/-5)
usc-wrapper (+0/-6)
To merge this branch: bzr merge lp:~mzanetti/ubuntu-touch-session/drop-sf-support
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Review via email: mp+213243@code.launchpad.net

Commit message

Drop SF support, always use ubuntumirclient QPA

To post a comment you must log in.
lp:~mzanetti/ubuntu-touch-session/drop-sf-support updated
172. By Michael Zanetti

bump Breaks unity8 version

173. By Michael Zanetti

Bump version to ensure incompatibility with surfaceflinger support.

Revision history for this message
Michał Sawicz (saviq) wrote :

Yup.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '52-ubuntu-touch.conf'
2--- 52-ubuntu-touch.conf 2014-02-13 03:39:35 +0000
3+++ 52-ubuntu-touch.conf 2014-04-01 09:18:46 +0000
4@@ -1,5 +1,5 @@
5 [SeatDefaults]
6-type=unity;surfaceflinger
7+type=unity
8 user-session=ubuntu-touch
9 unity-compositor-command=/usr/share/ubuntu-touch-session/usc-wrapper
10
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2014-03-07 17:42:23 +0000
14+++ debian/changelog 2014-04-01 09:18:46 +0000
15@@ -1,3 +1,9 @@
16+ubuntu-touch-session (0.107) UNRELEASED; urgency=medium
17+
18+ * Bump version to ensure incompatibility with surfaceflinger support.
19+
20+ -- Michał Sawicz <michal.sawicz@canonical.com> Mon, 31 Mar 2014 17:30:25 +0100
21+
22 ubuntu-touch-session (0.106) trusty; urgency=medium
23
24 * Adding config for deb (Nexus 7 - 2013 - Mobile)
25
26=== modified file 'debian/control'
27--- debian/control 2014-02-13 03:39:35 +0000
28+++ debian/control 2014-04-01 09:18:46 +0000
29@@ -13,7 +13,7 @@
30 lightdm (>= 1.9.5),
31 unity-system-compositor (>= 0.0.2),
32 upstart-app-launch (>= 0.1+13.10.20130923.4-0ubuntu1~),
33-Breaks: unity8 (<< 7.83~)
34+Breaks: unity8 (<< 7.85)
35 Description: Ubuntu Session Manager for Ubuntu Touch Devices
36 The ubuntu-touch-session tool aims to setup a very simple session
37 manager for the ubuntu-touch mobile shell.
38
39=== modified file 'etc/profile.d/qpa_plugin.sh'
40--- etc/profile.d/qpa_plugin.sh 2014-01-20 11:06:45 +0000
41+++ etc/profile.d/qpa_plugin.sh 2014-04-01 09:18:46 +0000
42@@ -1,5 +1,1 @@
43-if [ -f "$HOME/.display-mir" ]; then
44- export QT_QPA_PLATFORM=ubuntumirclient
45-else
46- export QT_QPA_PLATFORM=ubuntu
47-fi
48+export QT_QPA_PLATFORM=ubuntumirclient
49
50=== modified file 'ubuntu-touch-session'
51--- ubuntu-touch-session 2014-02-13 13:53:04 +0000
52+++ ubuntu-touch-session 2014-04-01 09:18:46 +0000
53@@ -5,11 +5,7 @@
54 # Do NOT add any other hacks here. We eventually intend for this wrapper to
55 # go away, once we dynamically determine screen settings.
56
57-if [ -n "$MIR_SOCKET" ]; then
58- export QT_QPA_PLATFORM=ubuntumirclient
59-else
60- export QT_QPA_PLATFORM=ubuntu
61-fi
62+export QT_QPA_PLATFORM=ubuntumirclient
63
64 # defaults
65 GRID_UNIT_PX=18
66
67=== modified file 'usc-wrapper'
68--- usc-wrapper 2014-02-27 16:23:00 +0000
69+++ usc-wrapper 2014-04-01 09:18:46 +0000
70@@ -1,11 +1,5 @@
71 #!/bin/sh
72
73-if [ ! -e /home/phablet/.display-mir ]; then
74- # LightDM will see that we failed to start and try the next seat, which
75- # should be surfaceflinger.
76- exit 1
77-fi
78-
79 # We need to grab ANDROID_ROOT from /etc/environment, because Mir uses
80 # it to find input configuration files and autopilot won't work without that.
81 . /etc/environment

Subscribers

People subscribed via source and target branches