rev 12105 - branches/kde4/packages/kdebase-workspace/debian

Fathi Boudra fabo at alioth.debian.org
Sun Sep 7 10:16:52 UTC 2008


Author: fabo
Date: 2008-09-07 10:16:52 +0000 (Sun, 07 Sep 2008)
New Revision: 12105

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/kdm.init
Log:
Add the status action to KDM's init script, merged from Ubuntu.


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-09-06 09:31:02 UTC (rev 12104)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-09-07 10:16:52 UTC (rev 12105)
@@ -1,16 +1,25 @@
-kdebase-workspace (4:4.1.1-2) experimental; urgency=low
+kdebase-workspace (4:4.1.1-2) UNRELEASED; urgency=low
 
+  +++ Changes by Fathi Boudra:
+
+  * Add the status action to KDM's init script, merged from Ubuntu:
+    * Depend on lsb-base >= 3.2-14, which has the status_of_proc() function.
+    * Import the LSB init functions, and add the 'status' action.
+    Thanks to Dustin Kirkland and Jonathan Riddell.
+
+  +++ Changes by Armin Berres:
+
   * Make the plasma trash applet call KDE 4's and not KDE 3's ktrash.
     Thanks to George Kiagiadakis for the patch (Closes: #494427).
 
- -- Armin Berres <trigger+debian at space-based.de>  Sat, 06 Sep 2008 11:27:22 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Sep 2008 11:27:22 +0200
 
 kdebase-workspace (4:4.1.1-1) experimental; urgency=low
 
   * New upstream release.
- 
+
   +++ Changes by Sune Vuorela:
-  
+
   * Refresh patches:
     - Remove 23_systray_fixes, merged upstream.
   * Kill off some dependencies off kdebase-workspace-dev. kdebase-workspace

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2008-09-06 09:31:02 UTC (rev 12104)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2008-09-07 10:16:52 UTC (rev 12105)
@@ -87,7 +87,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

Modified: branches/kde4/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdm.init	2008-09-06 09:31:02 UTC (rev 12104)
+++ branches/kde4/packages/kdebase-workspace/debian/kdm.init	2008-09-07 10:16:52 UTC (rev 12105)
@@ -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
@@ -35,8 +38,6 @@
 if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC}
 then
 
-
-
 KDMOVERRIDEDIR=/etc/default/kdm.d
 KDMCFGDIR=/var/run/kdm
 KDMCFG=$KDMCFGDIR/kdmrc
@@ -71,7 +72,6 @@
 [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG
 [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG
 
-
 fi
 #usetheme is now on "by default" so we need to be sure that there is something ...
 if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC}
@@ -178,9 +178,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




More information about the pkg-kde-commits mailing list