[Pkg-kde-commits] rev 1149 - branches/kde-3.4.0/packages/kdebase/debian

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-30 01:44:03 +0000 (Mon, 30 May 2005)
New Revision: 1149

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst
   branches/kde-3.4.0/packages/kdebase/debian/kdm.postrm
   branches/kde-3.4.0/packages/kdebase/debian/kdm.prerm
Log:
Update kdm maintainer scripts. Get rid of generic $THIS_PACKAGE stuff, which
causes problems with lint tools and isn't needed. Make the scripts more robust -
fall back to traditional daemon start/stop methods if needed.
Minor cleanups.


Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst	2005-05-30 01:42:09 UTC (rev 1148)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst	2005-05-30 01:44:03 UTC (rev 1149)
@@ -5,8 +5,6 @@
 # source debconf library
 . /usr/share/debconf/confmodule
 
-THIS_PACKAGE=kdm
-
 # debconf is not a registry, so we only fiddle with the default file if it
 # does not exist
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
@@ -122,10 +120,18 @@
 esac
 
 
-if [ -e /etc/init.d/kdm ]; then
-  update-rc.d "$THIS_PACKAGE" defaults 99 01 > /dev/null
+if [ -x "/etc/init.d/kdm" ]; then
+  update-rc.d kdm defaults 99 01 >/dev/null
 fi
 
-[ -n "$NOSTART" ] || invoke-rc.d "$THIS_PACKAGE" start || true
+if [ -n "$NOSTART" ]; then
+  exit 0
+else
+  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+    invoke-rc.d kdm start || true
+  else
+    /etc/init.d/kdm start || true
+  fi
+fi
 
 exit 0

Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.postrm
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.postrm	2005-05-30 01:42:09 UTC (rev 1148)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.postrm	2005-05-30 01:44:03 UTC (rev 1149)
@@ -1,24 +1,5 @@
-#! /bin/sh
-# postrm script for kdm
-#
-# see: dh_installdeb(1)
+#! /bin/sh -e
 
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-THIS_PACKAGE=kdm
-
 case "$1" in
     purge)
 	rm -rf /var/log/kdm.log*
@@ -44,20 +25,14 @@
 fi
 
 if [ "$1" = "purge" ]; then
-  update-rc.d "$THIS_PACKAGE" remove > /dev/null
   for DIR in /var/lib/kdm; do
     if [ -d "$DIR" ]; then
-      rm -r "$DIR"
+      rm -rf "$DIR"
     fi
   done
   rm -f /var/log/kdm.log*
 fi
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
-
-

Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.prerm
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.prerm	2005-05-30 01:42:09 UTC (rev 1148)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.prerm	2005-05-30 01:44:03 UTC (rev 1149)
@@ -23,8 +23,6 @@
   HAVE_DEBCONF=yes
 fi
 
-THIS_PACKAGE=kdm
-
 case "$1" in
     # we NEVER want to unconditionally stop kdm; see below
     upgrade|failed-upgrade)
@@ -88,7 +86,11 @@
 fi
 
 if [ -n "$STOP" ]; then
-  invoke-rc.d "$THIS_PACKAGE" stop || true
+  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+    invoke-rc.d kdm stop || true
+  else
+    /etc/init.d/kdm stop || true
+  fi
 else
   if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then
     touch /var/run/kdm.upgrade
@@ -114,7 +116,7 @@
       fi
       # are we removing the currently selected display manager?
       if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
-        if [ "$THIS_PACKAGE" = "$DEFAULT_DISPLAY_MANAGER" ]; then
+        if [ "kdm" = "$DEFAULT_DISPLAY_MANAGER" ]; then
           if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
             if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then
               # does the display manager file reference the current default?  if