[Pkg-kde-commits] rev 777 - in branches/kde-3.4.0/packages/kdebase/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-11 19:49:55 +0100 (Fri, 11 Mar 2005)
New Revision: 777

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/kdm.install
   branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
Log:
KDM's own .desktop sessions files are still useful, so add them
to the default SessionPath, but don't ship those which we don't
need (i.e. those which are provided by the window manager itself).


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-03-11 18:03:23 UTC (rev 776)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-03-11 18:49:55 UTC (rev 777)
@@ -8,18 +8,21 @@
   +++ Changes by Christopher Martin:
 
   * KDM no longer shows the Custom session. When it works at all, it simply
-    duplicates Default anyway. (Closes: #251602)
+    duplicates Default's behaviour anyway. (Closes: #251602)
 
-  * KDM now sources /etc/profile and the user's normal shell startup scripts.
-    (Closes: #173802, #211953, #250645, #250765, #289143)
+  * New KDM patches source /etc/profile and the user's normal shell startup
+    scripts. (Closes: #173802, #211953, #250645, #250765, #289143)
 
+  * KDM once again looks for window manager session definitions in
+    /usr/share/apps/kdm/sessions. (Closes: #293645)
+
   +++ Changes by Adeodato Simó:
 
   * After clearing up some issues with multiple de.po files being sent for
     inclusion, include an updated German po-debconf translation sent by
     Florian Ernst, and agreed upon several translators. (Closes: #291954)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri,  4 Mar 2005 19:34:17 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Fri, 11 Mar 2005 11:19:38 -0500
 
 kdebase (4:3.3.2-1) unstable; urgency=low
 

Modified: branches/kde-3.4.0/packages/kdebase/debian/kdm.install
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/kdm.install	2005-03-11 18:03:23 UTC (rev 776)
+++ branches/kde-3.4.0/packages/kdebase/debian/kdm.install	2005-03-11 18:49:55 UTC (rev 777)
@@ -27,33 +27,20 @@
 debian/tmp/usr/share/apps/kdm/sessions/9wm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/aewm++.desktop
 debian/tmp/usr/share/apps/kdm/sessions/aewm.desktop
-debian/tmp/usr/share/apps/kdm/sessions/afterstep.desktop
 debian/tmp/usr/share/apps/kdm/sessions/amaterus.desktop
-debian/tmp/usr/share/apps/kdm/sessions/amiwm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/asclassic.desktop
-debian/tmp/usr/share/apps/kdm/sessions/blackbox.desktop
-debian/tmp/usr/share/apps/kdm/sessions/cde.desktop
 debian/tmp/usr/share/apps/kdm/sessions/ctwm.desktop
-debian/tmp/usr/share/apps/kdm/sessions/cwwm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/enlightenment.desktop
 debian/tmp/usr/share/apps/kdm/sessions/evilwm.desktop
-debian/tmp/usr/share/apps/kdm/sessions/fluxbox.desktop
 debian/tmp/usr/share/apps/kdm/sessions/flwm.desktop
-debian/tmp/usr/share/apps/kdm/sessions/fvwm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/fvwm95.desktop
-debian/tmp/usr/share/apps/kdm/sessions/gnome.desktop
 debian/tmp/usr/share/apps/kdm/sessions/golem.desktop
-debian/tmp/usr/share/apps/kdm/sessions/icewm.desktop
-debian/tmp/usr/share/apps/kdm/sessions/ion.desktop
-debian/tmp/usr/share/apps/kdm/sessions/kde.desktop
 debian/tmp/usr/share/apps/kdm/sessions/larswm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/lwm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/matchbox.desktop
-debian/tmp/usr/share/apps/kdm/sessions/metacity.desktop
 debian/tmp/usr/share/apps/kdm/sessions/mwm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/olvwm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/olwm.desktop
-debian/tmp/usr/share/apps/kdm/sessions/openbox.desktop
 debian/tmp/usr/share/apps/kdm/sessions/oroborus.desktop
 debian/tmp/usr/share/apps/kdm/sessions/phluid.desktop
 debian/tmp/usr/share/apps/kdm/sessions/pwm.desktop
@@ -67,9 +54,6 @@
 debian/tmp/usr/share/apps/kdm/sessions/w9wm.desktop
 debian/tmp/usr/share/apps/kdm/sessions/waimea.desktop
 debian/tmp/usr/share/apps/kdm/sessions/wm2.desktop
-debian/tmp/usr/share/apps/kdm/sessions/wmaker.desktop
-debian/tmp/usr/share/apps/kdm/sessions/xfce.desktop
-debian/tmp/usr/share/apps/kdm/sessions/xfce4.desktop
 debian/tmp/usr/share/apps/kdm/themes/circles/background.svg
 debian/tmp/usr/share/apps/kdm/themes/circles/circles.xml
 debian/tmp/usr/share/apps/kdm/themes/circles/flower.png

Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2005-03-11 18:03:23 UTC (rev 776)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2005-03-11 18:49:55 UTC (rev 777)
@@ -5,7 +5,7 @@
  User: core
  User: greeter-c
 -Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
-+Instance: */"/etc/X11/sessions,/usr/share/xsessions"
++Instance: */"/usr/share/xsessions,/usr/share/apps/kdm/sessions"
  Comment:
   The directories containing session type definitions in .desktop format.
  Description: