[debian-edu-commits] r80371 - in branches/wheezy/debian-edu: debian tasks

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-08 11:52:36 +0000 (Sat, 08 Jun 2013)
New Revision: 80371

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/desktop-kde
   branches/wheezy/debian-edu/tasks/desktop-lxde
   branches/wheezy/debian-edu/tasks/desktop-xfce
Log:
Change default display manager for KDE, LXDE and Xfce from gdm3
(which pull in gnome), to kdm and lightdm, to avoid getting an
unwanted Gnome desktop.


Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-06-08 11:43:59 UTC (rev 80370)
+++ branches/wheezy/debian-edu/debian/changelog	2013-06-08 11:52:36 UTC (rev 80371)
@@ -6,9 +6,12 @@
     uploaded.
 
   [ Petter Reinholdtsen ]
+  * Change default display manager for KDE, LXDE and Xfce from gdm3
+    (which pull in gnome), to kdm and lightdm, to avoid getting an
+    unwanted Gnome desktop.
   * Change desktop-* to list x-display-manager as allowed alternative
-    for gdm3 to make it easier to pick another display manager for
-    those that need to.
+    for the selected display manager to make it easier to pick another
+    display manager for those that need to.
 
  -- Holger Levsen <holger at debian.org>  Fri, 07 Jun 2013 16:23:52 +0200
 

Modified: branches/wheezy/debian-edu/tasks/desktop-kde
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-kde	2013-06-08 11:43:59 UTC (rev 80370)
+++ branches/wheezy/debian-edu/tasks/desktop-kde	2013-06-08 11:52:36 UTC (rev 80371)
@@ -28,10 +28,11 @@
 Responsible: ? (someone need to check the package list is complete)
 NeedConfig:  no
 
-Depends:     gdm3 | x-display-manager
+Depends:     kdm | x-display-manager
 Avoid:       xdm
 Why:         The KDE desktop environment do not pull in a display manager.
-             Pick gdm3, which is the most feature complete one.
+             Pick kdm and not the most feature complete one gdm3,
+             because gdm3 pull in Gnome.
 NeedConfig:  yes, artwork
 
 Depends:     dragonplayer | totem | vlc | kaffeine | audacious | xine-ui | mplayer

Modified: branches/wheezy/debian-edu/tasks/desktop-lxde
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-lxde	2013-06-08 11:43:59 UTC (rev 80370)
+++ branches/wheezy/debian-edu/tasks/desktop-lxde	2013-06-08 11:52:36 UTC (rev 80371)
@@ -20,12 +20,12 @@
               gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, \
               synaptic
 
-Depends:      gdm3 | x-display-manager
+Depends:      lightdm | x-display-manager
 Avoid:        xdm
-Why:          The LXDE desktop environment pull in the lightdm display manager
-              by default.  Override and pick gdm3 instead, which is the
-              most feature complete one.
-Why:          Use lightdm as default
+Why:          The LXDE desktop environment pull in the lightdm display
+              manager by default.  Keep it, and do not override and
+              pick the most feature complete one gdm3 instead because
+              it pull in Gnome when installed.
 NeedConfig:   yes, artwork
 
 Depends:     totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer

Modified: branches/wheezy/debian-edu/tasks/desktop-xfce
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-xfce	2013-06-08 11:43:59 UTC (rev 80370)
+++ branches/wheezy/debian-edu/tasks/desktop-xfce	2013-06-08 11:52:36 UTC (rev 80371)
@@ -15,9 +15,10 @@
 Depends:      xfce4, xfce4-goodies
 Why:          The Xfce desktop environment.
 
-Depends:      gdm3 | x-display-manager
+Depends:      lightdm | x-display-manager
 Why:          The Xfce desktop environment do not pull in a display manager.
-              Pick gdm3, which is the most feature complete one.
-
+              Pick lightdm like for LXDE.  Do not override and pick
+              the most feature complete one gdm3 instead because it
+              pull in Gnome when installed.
 Recommends:   system-config-printer, tango-icon-theme, dbus-x11
 Why:          The Xfce desktop environment tools recommended by tasksel.