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

[Dimitri John Ledkov]

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

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-22 03:51:15 +0000
+++ debian/changelog	2014-02-04 10:20:09 +0000
@@ -1,3 +1,10 @@
+lightdm (1.9.6-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Clear default tty on lightdm shutdown, to avoid brief display of text
+    messages on shutdown. (LP: #967229)
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 04 Feb 2014 09:38:31 +0000
+
 lightdm (1.9.6-0ubuntu1) trusty; urgency=medium
 
   * New upstream release:

=== modified file 'debian/lightdm.upstart'
--- debian/lightdm.upstart	2013-07-16 23:36:16 +0000
+++ debian/lightdm.upstart	2014-02-04 10:20:09 +0000
@@ -52,6 +52,8 @@
 end script
 
 post-stop script
+	clear > /dev/tty7
+	sleep 1
 	if [ "$UPSTART_STOP_EVENTS" = runlevel ]; then
 		initctl emit desktop-shutdown
 	fi