rev 3496 - in trunk/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-06 19:10:11 +0000 (Thu, 06 Apr 2006)
New Revision: 3496

Modified:
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
Log:
New xsession directory.


Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2006-04-06 18:09:25 UTC (rev 3495)
+++ trunk/packages/kdebase/debian/control	2006-04-06 19:10:11 UTC (rev 3496)
@@ -225,7 +225,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, kdebase-bin (= ${Source-Version}), kdebase-data (>> ${KDE-Version3}), kdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients
 Recommends: logrotate
-Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version})
+Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu
 Provides: x-display-manager
 Description: X display manager for KDE
  kdm manages a collection of X servers, which may be on the local host or
@@ -239,6 +239,10 @@
  A collection of icons to associate with individual users is included with
  KDE, but as part of the kdepasswd package.
  .
+ The menu package will help to provide KDM with a list of window managers
+ that can be launched, if the window manager does not register with KDM
+ already. Most users won't need this.
+ .
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'kdebase' packages for more information.
 

Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-04-06 18:09:25 UTC (rev 3495)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-04-06 19:10:11 UTC (rev 3496)
@@ -25,11 +25,11 @@
  Key: SessionsDirs
  Type: list
 -Default: KDMDATA "/sessions"
-+Default: "/usr/share/xsessions,/usr/share/apps/kdm/sessions"
++Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
  User: core
  User: greeter-c
 -Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
-+Instance: #*/"/usr/share/xsessions,/usr/share/apps/kdm/sessions"
++Instance: #*/"/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
  Comment:
   The directories containing session type definitions in .desktop format.
  Description: