r23239 - in /desktop/unstable/gdm/debian: changelog gdm.config gdm.postinst gdm.postrm gdm.templates

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Mar  9 17:22:56 2010
New Revision: 23239

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23239
Log:
* gdm.templates, gdm.config: fix gdm daemon pathname (closes: #422735)
* gdm.config: get the old default display manager from
  /etc/X11/default-display-manager instead of from debconf (stolen from xdm)
* gdm.config, gdm.postinst, gdm.postrm: in config, move
  /etc/X11/default-display-manager away instead of removing it.  Delete it
  in postinst instead, to allow rollback in postrm abort-{install,upgrade}
  (stolen from xdm).

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/gdm.config
    desktop/unstable/gdm/debian/gdm.postinst
    desktop/unstable/gdm/debian/gdm.postrm
    desktop/unstable/gdm/debian/gdm.templates

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=23239&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm/debian/changelog [utf-8] Tue Mar  9 17:22:56 2010
@@ -17,6 +17,15 @@
     Closes: #348033.
   * 02_xdmcp-ipv6_bindv6only.patch: patch from Julien Cristau. Allow 
     xdmcp to work with net.ipv6.bindv6only=1. Closes: #563406.
+
+  [ Julien Cristau ]
+  * gdm.templates, gdm.config: fix gdm daemon pathname (closes: #422735)
+  * gdm.config: get the old default display manager from
+    /etc/X11/default-display-manager instead of from debconf (stolen from xdm)
+  * gdm.config, gdm.postinst, gdm.postrm: in config, move
+    /etc/X11/default-display-manager away instead of removing it.  Delete it
+    in postinst instead, to allow rollback in postrm abort-{install,upgrade}
+    (stolen from xdm).
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 14 Dec 2009 21:59:58 +0100
 

Modified: desktop/unstable/gdm/debian/gdm.config
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.config?rev=23239&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.config [utf-8] (original)
+++ desktop/unstable/gdm/debian/gdm.config [utf-8] Tue Mar  9 17:22:56 2010
@@ -12,10 +12,11 @@
 THIS_PACKAGE=gdm
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
+# update old gdm/daemon_name path
+db_set gdm/daemon_name /usr/sbin/gdm
+
 # set default display manager
-
-db_get shared/default-x-display-manager
-OLD_DEFAULT="$RET"
+OLD_DEFAULT=
 
 db_metaget shared/default-x-display-manager owners
 OWNERS="$RET"
@@ -27,6 +28,20 @@
   db_fset shared/default-x-display-manager seen false
 fi
 
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+  OLD_DAEMON="$(grep -v '^[[:space:]]*#' \
+                            "$DEFAULT_DISPLAY_MANAGER_FILE" |
+                            head -n 1)"
+  OLD_DEFAULT="$(basename $OLD_DAEMON)"
+  if [ -n "$OLD_DEFAULT" ]; then
+    db_set shared/default-x-manager "$OLD_DEFAULT"
+  fi
+else
+  if db_get shared/default-x-manager; then
+    OLD_DEFAULT="$RET"
+  fi
+fi
+
 db_input high shared/default-x-display-manager || true
 db_go
 
@@ -34,8 +49,11 @@
 db_get shared/default-x-display-manager
 CURRENT_DEFAULT="$RET"
 # remove the default display manager file if we're going to change it
-if [ "$OLD_DEFAULT" != "$CURRENT_DEFAULT" ]; then
-  rm -f $DEFAULT_DISPLAY_MANAGER_FILE
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+  if [ "$OLD_DEFAULT" != "$CURRENT_DEFAULT" ] ||
+     [ "$OLD_DAEMON" = /usr/bin/gdm ]; then
+    mv $DEFAULT_DISPLAY_MANAGER_FILE "DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+  fi
 fi
 
 exit 0

Modified: desktop/unstable/gdm/debian/gdm.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.postinst?rev=23239&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.postinst [utf-8] (original)
+++ desktop/unstable/gdm/debian/gdm.postinst [utf-8] Tue Mar  9 17:22:56 2010
@@ -42,6 +42,12 @@
     fi
   fi
 fi
+
+# remove the displaced old default display manager file if it exists
+if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+  rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+fi
+
 # debconf hangs if gdm gets started below without this
 db_stop || true
 

Modified: desktop/unstable/gdm/debian/gdm.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.postrm?rev=23239&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.postrm [utf-8] (original)
+++ desktop/unstable/gdm/debian/gdm.postrm [utf-8] Tue Mar  9 17:22:56 2010
@@ -1,4 +1,12 @@
 #!/bin/sh
+
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+  if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
+    mv "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE"
+  fi
+fi
 
 if [ "$1" = "purge" ] ; then
         update-rc.d gdm remove >/dev/null

Modified: desktop/unstable/gdm/debian/gdm.templates
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.templates?rev=23239&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.templates [utf-8] (original)
+++ desktop/unstable/gdm/debian/gdm.templates [utf-8] Tue Mar  9 17:22:56 2010
@@ -1,6 +1,6 @@
 Template: gdm/daemon_name
 Type: string
-Default: /usr/bin/gdm
+Default: /usr/sbin/gdm
 Description: for internal use only
 
 Template: shared/default-x-display-manager