KDE Base Workspace

Merge lp:~vorlon/kdebase-workspace/lp540177 into lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace

  1. lp540177
  2. Merge into kde-workspace
Proposed by Steve Langasek
Status: Merged
Approved by: Alessandro Ghersi
Approved revision: 314
Merged at revision: not available
Proposed branch: lp:~vorlon/kdebase-workspace/lp540177
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kde-workspace
Diff against target: 30 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/kdm.upstart (+1/-0)
To merge this branch: bzr merge lp:~vorlon/kdebase-workspace/lp540177
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-02 00:13:55 +0000
3+++ debian/changelog 2010-04-02 22:03:26 +0000
4@@ -1,8 +1,14 @@
5 kdebase-workspace (4:4.4.2-0ubuntu6) UNRELEASED; urgency=low
6
7+ [ Jonathan Riddell ]
8 * Add back and update kubuntu_12_kubuntu_homepage.diff to link to kubuntu.org
9 (LP: #553530)
10
11+ [ Steve Langasek ]
12+ * Make the upstart job handle plymouth teardown in the text / single-user
13+ boot cases, finishing up kdm's support for a smooth plymouth transition.
14+ LP: #540177.
15+
16 -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 01 Apr 2010 22:38:21 +0100
17
18 kdebase-workspace (4:4.4.2-0ubuntu5) lucid; urgency=low
19
20=== modified file 'debian/kdm.upstart'
21--- debian/kdm.upstart 2010-02-02 01:06:04 +0000
22+++ debian/kdm.upstart 2010-04-02 22:03:26 +0000
23@@ -27,6 +27,7 @@
24 do
25 case "${ARG}" in
26 text|-s|s|S|single)
27+ plymouth quit || : # We have the ball here
28 exit 0
29 ;;
30 esac

Subscribers

People subscribed via source and target branches

to all changes: