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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-04 08:42:56 +0100 (Fri, 04 Mar 2005)
New Revision: 633

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst
   branches/kde-3.4.0/packages/kdebase/debian/kdm.prerm
Log:
Minor script cleanups. More importantly,
remove DEBHELPER auto-generated sections
from kdm's postinst/prerm.
With CDBS, these are now populated, causing
kdm to kill X if upgraded while X running,
and other nasty problems (which should now
be fixed). Please report any bad behaviour
on kdm's part...


Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst	2005-03-04 04:58:08 UTC (rev 632)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.postinst	2005-03-04 07:42:56 UTC (rev 633)
@@ -1,42 +1,12 @@
 #! /bin/sh
-# postinst script for kdm
-#
-# see: dh_installdeb(1)
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
 # source debconf library
 . /usr/share/debconf/confmodule
 
 THIS_PACKAGE=kdm
 
-case "$1" in
-    configure)
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
 # 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
@@ -81,7 +51,6 @@
 
 # don't start kdm if we are upgrading without stopping it
 NOSTART=
-KDM_RUNNING=
 if [ -e /var/run/kdm.upgrade ]; then
   NOSTART=yes
 fi
@@ -96,10 +65,8 @@
   fi
 done
 # or if it's already running
-if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid \
-                     --exec /usr/bin/kdm; then
+if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm; then
   NOSTART=yes
-  KDM_RUNNING=yes
 fi
 # or if the options file says not to
 if ! grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options; then
@@ -112,11 +79,4 @@
 
 [ -n "$NOSTART" ] || invoke-rc.d "$THIS_PACKAGE" start || true
 
-# 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-03-04 04:58:08 UTC (rev 632)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.prerm	2005-03-04 07:42:56 UTC (rev 633)
@@ -47,7 +47,7 @@
 if grep -qs ^restart-on-upgrade /etc/kde3/kdm/kdm.options ||
    [ -n "$REMOVING" ]; then
   # is there an kdm process running?
-  if start-stop-daemon --stop --quiet --signal 0 --exec /usr/bin/kdm; then
+  if start-stop-daemon --stop --quiet --signal 0 --name kdm; then
     # any children?
     PARENTS=$(pidof /usr/bin/kdm || true)
     CHILDREN=
@@ -170,11 +170,4 @@
   fi
 fi
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
 exit 0
-
-