Merge lp:~darkxst/ubuntu/trusty/gdm/nokill into lp:ubuntu/trusty/gdm

[Tim Lunn]

Some recent change in trusty seems to have caused gdm to get killed when upgrading the package which brings down the current session.

This removes the kill command from postinst, to avoid killing the users session.

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-26 09:31:17 +0000
+++ debian/changelog	2014-01-20 23:47:57 +0000
@@ -1,3 +1,10 @@
+gdm (3.10.0.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/gdm.postinst:
+    - Don't kill gdm, since this brings down the current session when upgrading
+
+ -- Tim Lunn <[e-mail]>  Tue, 21 Jan 2014 10:39:39 +1100
+
 gdm (3.10.0.1-0ubuntu1) trusty; urgency=medium
 
   * New Upstream Release (LP: #1269981)

=== modified file 'debian/gdm.postinst'
--- debian/gdm.postinst	2013-07-30 20:04:14 +0000
+++ debian/gdm.postinst	2014-01-20 23:47:57 +0000
@@ -91,9 +91,6 @@
     rm -f /etc/pam.d/gdm-welcome
 fi
 
-PID=$(status "gdm" 2>/dev/null | awk '/[0-9]$/ { print $NF }')
-[ -z "$PID" ] || kill -HUP $PID
-
 if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
     dpkg-maintscript-helper rm_conffile /etc/X11/Xsession.d/60xdg_path-on-session 3.0.4-0ubuntu4 -- "$@"
 fi