Merge lp:~xnox/lightdm/archive-upload into lp:lightdm

Proposed by Dimitri John Ledkov on 2014-02-04
Status: Merged
Approved by: Robert Ancell on 2014-02-04
Approved revision: 1878
Merged at revision: 1878
Proposed branch: lp:~xnox/lightdm/archive-upload
Merge into: lp:lightdm
Diff against target: 27 lines (+9/-0)
2 files modified
debian/changelog (+7/-0)
debian/lightdm.upstart (+2/-0)
To merge this branch: bzr merge lp:~xnox/lightdm/archive-upload
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-02-04
Robert Ancell 2014-02-04 Approve on 2014-02-04
Review via email: mp+204627@code.launchpad.net

Description of the change

lp:lightdm is ahead of the archive, and lp:ubuntu/lightdm didn't match what's in the archive. I've fixed lp:ubuntu/lightdm and did direct upload.

Here is the sync of the changes, this time around it's a shutdown lightdm portion of bug #967229

To post a comment you must log in.
review: Approve
review: Approve (continuous-integration)

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 2014-01-22 03:51:15 +0000
3+++ debian/changelog 2014-02-04 10:20:09 +0000
4@@ -1,3 +1,10 @@
5+lightdm (1.9.6-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Clear default tty on lightdm shutdown, to avoid brief display of text
8+ messages on shutdown. (LP: #967229)
9+
10+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 04 Feb 2014 09:38:31 +0000
11+
12 lightdm (1.9.6-0ubuntu1) trusty; urgency=medium
13
14 * New upstream release:
15
16=== modified file 'debian/lightdm.upstart'
17--- debian/lightdm.upstart 2013-07-16 23:36:16 +0000
18+++ debian/lightdm.upstart 2014-02-04 10:20:09 +0000
19@@ -52,6 +52,8 @@
20 end script
21
22 post-stop script
23+ clear > /dev/tty7
24+ sleep 1
25 if [ "$UPSTART_STOP_EVENTS" = runlevel ]; then
26 initctl emit desktop-shutdown
27 fi

Subscribers

People subscribed via source and target branches