Plymouth

Merge lp:~gilir/plymouth/lxdm-support into lp:ubuntu/lucid/plymouth

  1. lxdm-support
  2. Merge into lucid
Proposed by Julien Lavergne
Status: Merged
Merged at revision: 1231
Proposed branch: lp:~gilir/plymouth/lxdm-support
Merge into: lp:ubuntu/lucid/plymouth
Diff against target: 60 lines (+11/-4)
3 files modified
debian/changelog (+5/-1)
debian/plymouth.plymouth-splash.upstart (+3/-1)
debian/plymouth.upstart (+3/-2)
To merge this branch: bzr merge lp:~gilir/plymouth/lxdm-support
Reviewer Review Type Date Requested Status
Plymouth Developers Pending
Review via email: mp+19280@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Julien Lavergne (gilir) wrote :

Support for lxdm display manager.
Plymouth support is supposed to be the same that gdm (ping plymouth, handle transition ...)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-14 00:17:46 +0000
3+++ debian/changelog 2010-02-14 00:22:30 +0000
4@@ -1,10 +1,14 @@
5 plymouth (0.8.0~-10ubuntu1) UNRELEASED; urgency=low
6
7+ [ Steve Langasek ]
8 * Merge from upstream:
9 - change plymouth-set-default-theme help output
10 - include upstream manpage (LP: #518414)
11
12- -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 13 Feb 2010 15:37:23 -0800
13+ [ Julien Lavergne ]
14+ * *.upstart: Add support for lxdm.
15+
16+ -- Julien Lavergne <gilir@ubuntu.com> Sun, 14 Feb 2010 00:48:33 +0100
17
18 plymouth (0.8.0~-10) lucid; urgency=low
19
20
21=== modified file 'debian/plymouth.plymouth-splash.upstart'
22--- debian/plymouth.plymouth-splash.upstart 2010-02-10 23:04:42 +0000
23+++ debian/plymouth.plymouth-splash.upstart 2010-02-14 00:22:30 +0000
24@@ -20,10 +20,12 @@
25 and (stopped gdm
26 or stopped kdm
27 or stopped xdm
28+ or stopped lxdm
29 )
30 )
31 )
32- ) or starting gdm)
33+ ) or starting gdm
34+ or starting lxdm)
35 stop on stopped plymouth
36
37 pre-start exec /bin/plymouth --show-splash
38
39=== modified file 'debian/plymouth.upstart'
40--- debian/plymouth.upstart 2010-02-01 23:03:21 +0000
41+++ debian/plymouth.upstart 2010-02-14 00:22:30 +0000
42@@ -7,7 +7,7 @@
43
44 description "Userspace bootsplash utility"
45
46-# gdm is deliberately missing
47+# gdm and lxdm are deliberately missing
48 stop on (starting kdm
49 or starting xdm
50 or stopped rc RUNLEVEL=[2345]
51@@ -17,7 +17,8 @@
52 or (runlevel [016]
53 and (stopped gdm
54 or stopped kdm
55- or stopped xdm)))
56+ or stopped xdm
57+ or stopped lxdm)))
58
59 expect fork
60 kill timeout 60

Subscribers

People subscribed via source and target branches

to all changes: