Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1659388 into lp:ubuntu-keyboard

Proposed by Michael Sheldon
Status: Merged
Approved by: Michael Sheldon
Approved revision: 541
Merged at revision: 538
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-1659388
Merge into: lp:ubuntu-keyboard
Prerequisite: lp:~michael-sheldon/ubuntu-keyboard/fix-mir-deprecation
Diff against target: 44 lines (+19/-1)
3 files modified
debian/control (+3/-1)
debian/ubuntu-keyboard.install (+1/-0)
debian/upstart/maliit-server.conf (+15/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-1659388
Reviewer Review Type Date Requested Status
Michael Terry Approve
system-apps-ci-bot continuous-integration Pending
Review via email: mp+317508@code.launchpad.net

This proposal supersedes a proposal from 2017-02-16.

Commit message

Add maliit upstart job

Description of the change

Add maliit upstart job

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Looks fine to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-01-10 15:28:21 +0000
3+++ debian/control 2017-02-20 22:07:06 +0000
4@@ -55,7 +55,9 @@
5 ubuntu-keyboard-english (>= ${source:Version}),
6 ${misc:Depends},
7 ${shlibs:Depends},
8-Breaks: unity8 (<< 8.13),
9+Replaces: ubuntu-touch-session (<< 0.109),
10+Breaks: ubuntu-touch-session (<< 0.109),
11+ unity8 (<< 8.13),
12 Description: Ubuntu on-screen keyboard
13 Ubuntu Keyboard based on Maliit-Keyboard
14 .
15
16=== modified file 'debian/ubuntu-keyboard.install'
17--- debian/ubuntu-keyboard.install 2014-12-09 13:04:57 +0000
18+++ debian/ubuntu-keyboard.install 2017-02-20 22:07:06 +0000
19@@ -2,3 +2,4 @@
20 usr/lib/maliit/plugins/libubuntu-keyboard-plugin.so
21 usr/share/maliit/plugins/com/ubuntu/lib/libwesternsupport.a
22 usr/share/locale/*/LC_MESSAGES/ubuntu-keyboard.mo
23+debian/upstart/maliit-server.conf /usr/share/upstart/sessions/
24
25=== added directory 'debian/upstart'
26=== added file 'debian/upstart/maliit-server.conf'
27--- debian/upstart/maliit-server.conf 1970-01-01 00:00:00 +0000
28+++ debian/upstart/maliit-server.conf 2017-02-20 22:07:06 +0000
29@@ -0,0 +1,15 @@
30+description "Maliit OSK Server"
31+author "Ricardo Mendoza <ricmm@ubuntu.com>"
32+
33+# nowadays, maliit-server needs to start *after* unity8, or it crashes while
34+# trying to poke geometry
35+start on started unity8
36+stop on stopping unity8
37+
38+# needed to fix lp:1233550
39+env QML_BAD_GUI_RENDER_LOOP=1
40+env PULSE_PROP='media.role=feedbacksound'
41+
42+respawn
43+
44+exec maliit-server

Subscribers

People subscribed via source and target branches