Plymouth

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

  1. lxdm-support
  2. Merge into lucid
Proposed by Julien Lavergne
Status: Merged
Merged at revision: 1231
Proposed branch: lp://staging/~gilir/plymouth/lxdm-support
Merge into: lp://staging/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://staging/~gilir/plymouth/lxdm-support
Reviewer Review Type Date Requested Status
Plymouth Developers Pending
Review via email: mp+19280@code.staging.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
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-14 00:17:46 +0000
+++ debian/changelog 2010-02-14 00:22:30 +0000
@@ -1,10 +1,14 @@
1plymouth (0.8.0~-10ubuntu1) UNRELEASED; urgency=low1plymouth (0.8.0~-10ubuntu1) UNRELEASED; urgency=low
22
3 [ Steve Langasek ]
3 * Merge from upstream:4 * Merge from upstream:
4 - change plymouth-set-default-theme help output5 - change plymouth-set-default-theme help output
5 - include upstream manpage (LP: #518414)6 - include upstream manpage (LP: #518414)
67
7 -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 13 Feb 2010 15:37:23 -08008 [ Julien Lavergne ]
9 * *.upstart: Add support for lxdm.
10
11 -- Julien Lavergne <gilir@ubuntu.com> Sun, 14 Feb 2010 00:48:33 +0100
812
9plymouth (0.8.0~-10) lucid; urgency=low13plymouth (0.8.0~-10) lucid; urgency=low
10 14
1115
=== modified file 'debian/plymouth.plymouth-splash.upstart'
--- debian/plymouth.plymouth-splash.upstart 2010-02-10 23:04:42 +0000
+++ debian/plymouth.plymouth-splash.upstart 2010-02-14 00:22:30 +0000
@@ -20,10 +20,12 @@
20 and (stopped gdm20 and (stopped gdm
21 or stopped kdm21 or stopped kdm
22 or stopped xdm22 or stopped xdm
23 or stopped lxdm
23 )24 )
24 )25 )
25 )26 )
26 ) or starting gdm)27 ) or starting gdm
28 or starting lxdm)
27stop on stopped plymouth29stop on stopped plymouth
2830
29pre-start exec /bin/plymouth --show-splash31pre-start exec /bin/plymouth --show-splash
3032
=== modified file 'debian/plymouth.upstart'
--- debian/plymouth.upstart 2010-02-01 23:03:21 +0000
+++ debian/plymouth.upstart 2010-02-14 00:22:30 +0000
@@ -7,7 +7,7 @@
77
8description "Userspace bootsplash utility"8description "Userspace bootsplash utility"
99
10# gdm is deliberately missing10# gdm and lxdm are deliberately missing
11stop on (starting kdm11stop on (starting kdm
12 or starting xdm12 or starting xdm
13 or stopped rc RUNLEVEL=[2345]13 or stopped rc RUNLEVEL=[2345]
@@ -17,7 +17,8 @@
17 or (runlevel [016]17 or (runlevel [016]
18 and (stopped gdm18 and (stopped gdm
19 or stopped kdm19 or stopped kdm
20 or stopped xdm)))20 or stopped xdm
21 or stopped lxdm)))
2122
22expect fork23expect fork
23kill timeout 6024kill timeout 60

Subscribers

People subscribed via source and target branches

to all changes: