Merge lp://staging/~bregma/unity8-desktop-session/merge-upstart-jobs into lp://staging/unity8-desktop-session
Proposed by
Stephen M. Webb
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Christopher Townsend | ||||
| Approved revision: | 66 | ||||
| Merged at revision: | 64 | ||||
| Proposed branch: | lp://staging/~bregma/unity8-desktop-session/merge-upstart-jobs | ||||
| Merge into: | lp://staging/unity8-desktop-session | ||||
| Prerequisite: | lp://staging/~bregma/unity8-desktop-session/move-desktop-files | ||||
| Diff against target: |
155 lines (+5/-81) 6 files modified
data/Makefile.am (+1/-15) data/lightdm-unity8-session (+2/-0) data/start-unity8-mir (+0/-5) data/unity8-mir.conf (+0/-57) data/unity8-mir.desktop (+1/-1) debian/unity8-desktop-session-mir.install (+1/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~bregma/unity8-desktop-session/merge-upstart-jobs | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Christopher Townsend (community) | Approve | ||
|
Review via email:
|
|||
Commit message
remove the separate unity8-mir upstart job because the unity8 upstart job does everything necessary
Description of the change
Moved the last desktop-specific settings into the LightDM wrapper script so the default unity 8 upstart job can be used to start the shell.
This change requires changes to the Unity 8 upstart jobs (unity and unity-dash) to be landed at the same time.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Yea, we have the Dash again!