r10634 - in /desktop/unstable/gdm/debian: changelog gdm.postinst

[lool at users.alioth.debian.org]

Author: lool
Date: Tue May  1 16:00:06 2007
New Revision: 10634

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10634
Log:
* Start gdm in S30 instead of S21; thanks Sjoerd Simons; closes: #419392.
* Rework gdm.postinst to only run version-specific upgrade code during
  upgrades from these versions and to always run update-rc.d in these cases.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/gdm.postinst

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=10634&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Tue May  1 16:00:06 2007
@@ -47,8 +47,11 @@
     version before sarge don't have to be supported.
   * Check for the usability of deluser and delgroup before running these in
     gdm.postrm.
-
- -- Loic Minier <lool at dooz.org>  Tue, 01 May 2007 17:24:40 +0200
+  * Start gdm in S30 instead of S21; thanks Sjoerd Simons; closes: #419392.
+  * Rework gdm.postinst to only run version-specific upgrade code during
+    upgrades from these versions and to always run update-rc.d in these cases.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 01 May 2007 17:58:02 +0200
 
 gdm (2.16.4-1.1) unstable; urgency=low
 

Modified: desktop/unstable/gdm/debian/gdm.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.postinst?rev=10634&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.postinst (original)
+++ desktop/unstable/gdm/debian/gdm.postinst Tue May  1 16:00:06 2007
@@ -45,12 +45,26 @@
 # debconf hangs if gdm gets started below without this
 db_stop || true
 
-if [ -e /etc/rc2.d/S99gdm ]; then
-  update-rc.d -f gdm remove >/dev/null
+# update-rc.d levels
+S=30
+K=01
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.16.1-1"; then
+    # since 2.16.1-1, gdm isn't started from S99 anymore
+    if [ -e /etc/rc2.d/S99gdm ]; then
+        update-rc.d -f gdm remove >/dev/null
+        update-rc.d gdm defaults $S $K
+    fi
+elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "2.16.4-1"; then
+    # since after 2.16.4-1.1, gdm isn't started from S21 anymore
+    if [ -e /etc/rc2.d/S21gdm ]; then
+        update-rc.d -f gdm remove >/dev/null
+        update-rc.d gdm defaults $S $K
+    fi
 fi
 
 if [ -x /etc/init.d/gdm ]; then
-  update-rc.d gdm defaults 21 01 >/dev/null 2>&1
+  update-rc.d gdm defaults $S $K >/dev/null 2>&1
   invoke-rc.d gdm reload || true
 fi