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

[Michael Sheldon]

Add maliit upstart job

Add maliit upstart job

[Michael Terry (mterry)]

Looks fine to me!

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-01-10 15:28:21 +0000
+++ debian/control	2017-02-20 22:07:06 +0000
@@ -55,7 +55,9 @@
          ubuntu-keyboard-english (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-Breaks: unity8 (<< 8.13),
+Replaces: ubuntu-touch-session (<< 0.109),
+Breaks: ubuntu-touch-session (<< 0.109),
+        unity8 (<< 8.13),
 Description: Ubuntu on-screen keyboard
  Ubuntu Keyboard based on Maliit-Keyboard
  .
 
=== modified file 'debian/ubuntu-keyboard.install'
--- debian/ubuntu-keyboard.install	2014-12-09 13:04:57 +0000
+++ debian/ubuntu-keyboard.install	2017-02-20 22:07:06 +0000
@@ -2,3 +2,4 @@
 usr/lib/maliit/plugins/libubuntu-keyboard-plugin.so
 usr/share/maliit/plugins/com/ubuntu/lib/libwesternsupport.a
 usr/share/locale/*/LC_MESSAGES/ubuntu-keyboard.mo
+debian/upstart/maliit-server.conf /usr/share/upstart/sessions/
 
=== added directory 'debian/upstart'
=== added file 'debian/upstart/maliit-server.conf'
--- debian/upstart/maliit-server.conf	1970-01-01 00:00:00 +0000
+++ debian/upstart/maliit-server.conf	2017-02-20 22:07:06 +0000
@@ -0,0 +1,15 @@
+description "Maliit OSK Server"
+author "Ricardo Mendoza <[e-mail]>"
+
+# nowadays, maliit-server needs to start *after* unity8, or it crashes while
+# trying to poke geometry
+start on started unity8
+stop on stopping unity8
+
+# needed to fix lp:1233550
+env QML_BAD_GUI_RENDER_LOOP=1
+env PULSE_PROP='media.role=feedbacksound'
+
+respawn
+
+exec maliit-server