rev 6401 - branches/kde4/packages/kdebase/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2007-05-29 21:05:48 +0000 (Tue, 29 May 2007)
New Revision: 6401

Removed:
   branches/kde4/packages/kdebase/debian/ksmserver.install
Modified:
   branches/kde4/packages/kdebase/debian/control
   branches/kde4/packages/kdebase/debian/kdesktop.install
Log:
let us merge kdesktop and ksmserver - there is no use cases where you would like only one of them


Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2007-05-29 20:44:21 UTC (rev 6400)
+++ branches/kde4/packages/kdebase/debian/control	2007-05-29 21:05:48 UTC (rev 6401)
@@ -206,8 +206,16 @@
 Depends: ${shlibs:Depends}
 Description: miscellaneous binaries and files for the KDE desktop
  This package contains miscellaneous binaries and files integral to
- the KDE desktop.
+ the KDE desktop, including KDE session manager. It is responsible for
+ restoring your KDE session on login. It is also needed to properly
+ start a KDE session. It registers KDE with X display managers, and
+ provides the 'startkde' command, for starting an X session with KDE
+ from the console.
  .
+ If you are running KDE for the first time for a certain user,
+ kpersonalizer is used to help with setup. If it is not present,
+ KDE will start, but many good defaults will not be set.
+ .
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'kdebase' packages for more information.
 
@@ -371,25 +379,6 @@
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'kdebase' packages for more information.
 
-Package: ksmserver
-Section: kde
-Architecture: any
-Provides: x-session-manager
-Depends: ${shlibs:Depends}, kwin (= ${Source-Version}) | x-window-manager
-Description: session manager for KDE
- This package contains the KDE session manager. It is responsible for
- restoring your KDE session on login. It is also needed to properly
- start a KDE session. It registers KDE with X display managers, and
- provides the 'startkde' command, for starting an X session with KDE
- from the console.
- .
- If you are running KDE for the first time for a certain user,
- kpersonalizer is used to help with setup. If it is not present,
- KDE will start, but many good defaults will not be set.
- .
- This package is part of KDE, and a component of the KDE base module.
- See the 'kde' and 'kdebase' packages for more information.
-
 Package: ksplash
 Section: kde
 Architecture: any

Modified: branches/kde4/packages/kdebase/debian/kdesktop.install
===================================================================
--- branches/kde4/packages/kdebase/debian/kdesktop.install	2007-05-29 20:44:21 UTC (rev 6400)
+++ branches/kde4/packages/kdebase/debian/kdesktop.install	2007-05-29 21:05:48 UTC (rev 6401)
@@ -63,3 +63,10 @@
 usr/share/templates/.source/URL.desktop
 usr/share/templates/.source/ZIP-Device.desktop
 usr/share/templates/TextFile.desktop
+usr/bin/ksmserver
+usr/bin/startkde
+usr/lib/libkdeinit_ksmserver.so
+usr/share/apps/kconf_update/ksmserver.upd
+usr/share/apps/kconf_update/move_session_config.sh
+usr/share/apps/ksmserver/pics/shutdownkonq.png
+usr/share/dbus-1/interfaces/org.kde.KSMServerInterface.xml

Deleted: branches/kde4/packages/kdebase/debian/ksmserver.install