r36190 - in /desktop/unstable/gdm3/debian: changelog gdm3.prerm

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Oct 25 21:07:19 2012
New Revision: 36190

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36190
Log:
gdm3.prerm: do not stop gdm3 if $DISPLAY is between :0 and :9 which 
generally mean local displays. Displays > 10 will most of the time 
mean SSH.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/gdm3.prerm

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=36190&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Thu Oct 25 21:07:19 2012
@@ -1,3 +1,11 @@
+gdm3 (3.4.1-5) UNRELEASED; urgency=low
+
+  * gdm3.prerm: do not stop gdm3 if $DISPLAY is between :0 and :9 which 
+    generally mean local displays. Displays > 10 will most of the time 
+    mean SSH.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 25 Oct 2012 22:59:16 +0200
+
 gdm3 (3.4.1-4) unstable; urgency=low
 
   * Team upload

Modified: desktop/unstable/gdm3/debian/gdm3.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.prerm?rev=36190&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.prerm [utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.prerm [utf-8] Thu Oct 25 21:07:19 2012
@@ -49,7 +49,7 @@
   if [ -x /etc/init.d/gdm3 ]; then
     nostop=
     for hostname in "" "localhost" "$(hostname)" "$(hostname -f)"; do
-      if echo $DISPLAY | grep -q "^$hostname:0.*"; then
+      if echo $DISPLAY | egrep -q '^:[0-9](\.[0-9])?$'; then
         nostop=yes
       fi
     done