[pkg-kde-commits] rev 2918 - in trunk/packages/kdebase/debian: . man

[Christopher Martin]

Author: chrsmrtn
Date: 2006-01-17 17:35:29 +0000 (Tue, 17 Jan 2006)
New Revision: 2918

Added:
   trunk/packages/kdebase/debian/ksmserver.manpages
   trunk/packages/kdebase/debian/man/startkde.1
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/ksmserver.postinst
Log:
Merge patches and manpage; test build now running.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-01-17 00:17:48 UTC (rev 2917)
+++ trunk/packages/kdebase/debian/changelog	2006-01-17 17:35:29 UTC (rev 2918)
@@ -1,3 +1,12 @@
+kdebase (4:3.5.0-5) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Merge startkde manpage (and maintainer script patch to fully integrate it)
+    from Philipp Grau. Thanks. (Closes: #348501)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+
 kdebase (4:3.5.0-4) unstable; urgency=low
 
   +++ Changes by Isaac Clerencia

Added: trunk/packages/kdebase/debian/ksmserver.manpages
===================================================================
--- trunk/packages/kdebase/debian/ksmserver.manpages	2006-01-17 00:17:48 UTC (rev 2917)
+++ trunk/packages/kdebase/debian/ksmserver.manpages	2006-01-17 17:35:29 UTC (rev 2918)
@@ -0,0 +1 @@
+debian/man/startkde.1

Modified: trunk/packages/kdebase/debian/ksmserver.postinst
===================================================================
--- trunk/packages/kdebase/debian/ksmserver.postinst	2006-01-17 00:17:48 UTC (rev 2917)
+++ trunk/packages/kdebase/debian/ksmserver.postinst	2006-01-17 17:35:29 UTC (rev 2918)
@@ -19,7 +19,11 @@
 
 case "$1" in
     configure)
-        update-alternatives --install /usr/bin/x-session-manager x-session-manager /usr/bin/startkde 40
+        update-alternatives --install /usr/bin/x-session-manager \
+	x-session-manager /usr/bin/startkde 40 \
+	--slave /usr/share/man/man1/x-session-manager.1.gz \
+	x-session-manager.1.gz "/usr/share/man/man1/startkde.1.gz"
+    
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Added: trunk/packages/kdebase/debian/man/startkde.1
===================================================================
--- trunk/packages/kdebase/debian/man/startkde.1	2006-01-17 00:17:48 UTC (rev 2917)
+++ trunk/packages/kdebase/debian/man/startkde.1	2006-01-17 17:35:29 UTC (rev 2918)
@@ -0,0 +1,45 @@
+.TH startkde 1 "Jan 17, 2005"
+.SH NAME
+startkde \- Starts up the KDE Desktop Environment 
+.SH SYNOPSIS
+.B startkde
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B startkde
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+The \fBstartkde\fP program starts up the KDE Desktop Environment and
+is typicaly executed by your login manager (e.g. xdm, gdm, kdm, wdm or from
+your X startup scripts). It will load your last session or a default session
+that includes the standard KDE programs if no saved session is available.
+
+\fBstartkde\fP is an standard X11R6 session manager that can manage
+any X11R6 SM compliant program.
+
+\fBstartkde\fP uses the contens of the ~/.kde/ directory
+for starting previously saved sessions. Source scripts found in ~/.kde/env/*.sh
+can be used to define environment variables that will be available to all KDE 
+programs.
+
+For anything else (that doesn't set env vars, or that needs a window manager),
+better use the ~/.kde/Autostart folder.
+
+At the end of a session scripts found in ~/.kde/shutdown will be executed.
+
+
+.SH OPTIONS
+\fBstartkde\fP takes no command line options.
+
+.SH AUTHOR
+\fBstartkde\fP is written by the KDE Project
+
+This manual page was written by Philipp Grau.
+
+.SH "REPORTING BUGS"
+Report bugs of this modified Debian version of startkde to the Bug
+Tracking System at http://bugs.debian.org/
+.SH COPYRIGHT
+Copyright \(co 2005 Philipp Grau.