Merge lp:~ted/ubuntu-touch-session/conflicts-lightdm into lp:ubuntu-touch-session

Proposed by Ted Gould
Status: Rejected
Rejected by: Ted Gould
Proposed branch: lp:~ted/ubuntu-touch-session/conflicts-lightdm
Merge into: lp:ubuntu-touch-session
Diff against target: 13 lines (+2/-1)
1 file modified
debian/control (+2/-1)
To merge this branch: bzr merge lp:~ted/ubuntu-touch-session/conflicts-lightdm
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+179056@code.launchpad.net

Commit message

Conflict with LightDM

Description of the change

Currently this replaces the session startup that is done by LightDM, and so it should conflict with it. As this moves on to use LightDM to start the session then the conflict can be dropped.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Rumor has it that Mike Terry also lost time with his machine being fubar because of this package. Can we please get this protection merged?

Unmerged revisions

87. By Ted Gould

Conflict with lightdm

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 2013-07-04 00:45:52 +0000
3+++ debian/control 2013-08-07 22:08:27 +0000
4@@ -11,7 +11,8 @@
5 Depends: ${shlibs:Depends},
6 ${misc:Depends},
7 upstart-app-launch,
8-Conflicts: qml-phone-shell (<< 7.80~)
9+Conflicts: qml-phone-shell (<< 7.80~),
10+ lightdm,
11 Description: Ubuntu Session Manager for Ubuntu Touch Devices
12 The ubuntu-touch-session tool aims to setup a very simple session
13 manager for the ubuntu-touch mobile shell.

Subscribers

People subscribed via source and target branches

to all changes: