Light Display Manager

Merge lp:~xnox/lightdm/improve-systemd into lp:lightdm

Proposed by Dimitri John Ledkov on 2014-05-17

Status:	Merged
Merged at revision:	1991
Proposed branch:	lp:~xnox/lightdm/improve-systemd
Merge into:	lp:lightdm
Diff against target:	40 lines (+9/-2) 3 files modified debian/changelog (+6/-0) debian/control (+1/-1) debian/lightdm.service (+2/-1)
To merge this branch:	bzr merge lp:~xnox/lightdm/improve-systemd
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-05-17
LightDM Development Team		2014-05-17	Pending
Review via email: mp+219945@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-17:

FAILED: Continuous integration, rev:1991
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/lightdm/improve-systemd/+merge/219945/+edit-commit-message

review: Needs Fixing (continuous-integration)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2014-05-15 23:00:38 +0000
3	+++ debian/changelog 2014-05-17 18:48:32 +0000
4	@@ -1,3 +1,9 @@
5	+lightdm (1.11.2-0ubuntu2) utopic; urgency=medium
6	+
7	+ * Integration plymouth systemd system job with plymouth services.
8	+
9	+ -- Dimitri John Ledkov <xnox@ubuntu.com> Sat, 17 May 2014 19:18:41 +0100
10	+
11	lightdm (1.11.2-0ubuntu1) utopic; urgency=medium
12
13	* New upstream release:
14
15	=== modified file 'debian/control'
16	--- debian/control 2014-04-26 17:07:03 +0000
17	+++ debian/control 2014-05-17 18:48:32 +0000
18	@@ -40,7 +40,7 @@
19	adduser,
20	libglib2.0-bin,
21	dbus,
22	- plymouth (>= 0.8.8-0ubuntu6.1),
23	+ plymouth (>= 0.8.8-0ubuntu18),
24	Recommends: xserver-xorg,
25	unity-greeter \| lightdm-greeter \| lightdm-kde-greeter,
26	Conflicts: liblightdm-gobject-0-0,
27
28	=== modified file 'debian/lightdm.service'
29	--- debian/lightdm.service 2014-04-26 19:32:50 +0000
30	+++ debian/lightdm.service 2014-05-17 18:48:32 +0000
31	@@ -1,7 +1,8 @@
32	[Unit]
33	Description=Light Display Manager
34	Documentation=man:lightdm(1)
35	-After=systemd-user-sessions.service
36	+Conflicts=getty@tty7.service plymouth-quit.service
37	+After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service
38
39	[Service]
40	# temporary safety check until all DMs are converted to correct