diff -u kdebase-workspace-4.1.0/debian/kdm.init kdebase-workspace-4.1.0/debian/kdm.init --- kdebase-workspace-4.1.0/debian/kdm.init +++ kdebase-workspace-4.1.0/debian/kdm.init @@ -17,6 +17,9 @@ # set -e +# Import the LSB init functions +. /lib/lsb/init-functions + # To start kdm even if it is not the default display manager, change # HEED_DEFAULT_DISPLAY_MANAGER to "false." HEED_DEFAULT_DISPLAY_MANAGER=true @@ -173,9 +176,12 @@ fi echo "." ;; + status) + status_of_proc -p "$PIDFILE" "$DAEMON" kdm && exit 0 || exit $? + ;; *) - echo "Usage: /etc/init.d/kdm {start|stop|restart|reload|force-reload}" + echo "Usage: /etc/init.d/kdm {start|stop|restart|reload|force-reload|status}" exit 1 ;; esac diff -u kdebase-workspace-4.1.0/debian/control kdebase-workspace-4.1.0/debian/control --- kdebase-workspace-4.1.0/debian/control +++ kdebase-workspace-4.1.0/debian/control @@ -102,7 +102,7 @@ Package: kdm Section: x11 Architecture: any -Depends: ${shlibs:Depends}, debconf | debconf-2.0 +Depends: ${shlibs:Depends}, debconf | debconf-2.0, lsb-base (>= 3.2.14) Recommends: logrotate, xserver-xorg-core | xserver, kdebase | x-session-manager | x-window-manager, xterm | x-terminal-emulator Suggests: kdepasswd diff -u kdebase-workspace-4.1.0/debian/changelog kdebase-workspace-4.1.0/debian/changelog --- kdebase-workspace-4.1.0/debian/changelog +++ kdebase-workspace-4.1.0/debian/changelog @@ -1,3 +1,12 @@ +kdebase-workspace (4:4.1.0-0ubuntu6) intrepid; urgency=low + + * debian/control: Depend on lsb-base >= 3.2-14, which has the + status_of_proc() function. + * debian/kdm.init: Import the LSB init functions, and add the 'status' + action (LP: #259446). + + -- Dustin Kirkland Tue, 19 Aug 2008 16:05:34 +0100 + kdebase-workspace (4:4.1.0-0ubuntu5) intrepid; urgency=low * Fix compile for network-manager 0.7