Ubuntu Touch session manager

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

  1. fix-1659388
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Michael Sheldon
Approved revision: 298
Merged at revision: 300
Proposed branch: lp:~michael-sheldon/ubuntu-touch-session/fix-1659388
Merge into: lp:ubuntu-touch-session
Diff against target: 34 lines (+7/-15)
2 files modified
debian/changelog (+7/-0)
upstart-session/maliit-server.conf (+0/-15)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-touch-session/fix-1659388
Reviewer Review Type Date Requested Status
Michael Terry Approve
Review via email: mp+317522@code.launchpad.net

Commit message

Remove maliit-server.conf (now provided by the ubuntu-keyboard package)

Description of the change

Remove maliit-server.conf (now provided by the ubuntu-keyboard package)

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

The corresponding ubuntu-keyboard MR is: https://code.launchpad.net/~michael-sheldon/ubuntu-keyboard/fix-1659388/+merge/317508

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
=== modified file 'debian/changelog'
--- debian/changelog 2016-12-06 13:46:42 +0000
+++ debian/changelog 2017-02-16 16:44:57 +0000
@@ -1,3 +1,10 @@
1ubuntu-touch-session (0.109) UNRELEASED; urgency=medium
2
3 * Remove maliit upstart job (moved to ubuntu-keyboard package)
4 * Increase version number to allow for Breaks/Replaces in ubuntu-keyboard
5
6 -- Michael Sheldon <michael.sheldon@canonical.com> Thu, 16 Feb 2017 16:35:36 +0000
7
1ubuntu-touch-session (0.108+17.04.20161206-0ubuntu1) zesty; urgency=medium8ubuntu-touch-session (0.108+17.04.20161206-0ubuntu1) zesty; urgency=medium
29
3 * Support running inside a snap (without breaking non-snap runs). (LP:10 * Support running inside a snap (without breaking non-snap runs). (LP:
411
=== removed file 'upstart-session/maliit-server.conf'
--- upstart-session/maliit-server.conf 2014-09-23 06:03:47 +0000
+++ upstart-session/maliit-server.conf 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1description "Maliit OSK Server"
2author "Ricardo Mendoza <ricmm@ubuntu.com>"
3
4# nowadays, maliit-server needs to start *after* unity8, or it crashes while
5# trying to poke geometry
6start on started unity8
7stop on stopping unity8
8
9# needed to fix lp:1233550
10env QML_BAD_GUI_RENDER_LOOP=1
11env PULSE_PROP='media.role=feedbacksound'
12
13respawn
14
15exec maliit-server

Subscribers

People subscribed via source and target branches