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

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-29 18:27:10 +0000 (Wed, 29 May 2013)
New Revision: 80268

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/desktop-kde
   branches/wheezy/debian-edu/tasks/desktop-lxde
Log:
Change desktop-kde and desktop-lxde to use gdm3 too, to only have
to configure one display manager.

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-05-29 12:10:40 UTC (rev 80267)
+++ branches/wheezy/debian-edu/debian/changelog	2013-05-29 18:27:10 UTC (rev 80268)
@@ -9,6 +9,8 @@
   * Make sure the new task desktop-xfce pull in a display manager.  I
     selected gdm, which is the same as Gnome is using, and which is
     the most feature complete one.  kdm and lightdm would work too.
+  * Change desktop-kde and desktop-lxde to use gdm3 too, to only have
+    to configure one display manager.
 
  -- Holger Levsen <holger at debian.org>  Tue, 28 May 2013 19:18:15 +0200
 

Modified: branches/wheezy/debian-edu/tasks/desktop-kde
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-kde	2013-05-29 12:10:40 UTC (rev 80267)
+++ branches/wheezy/debian-edu/tasks/desktop-kde	2013-05-29 18:27:10 UTC (rev 80268)
@@ -7,7 +7,7 @@
  This metapackage depends on various KDE office and desktop applications
  that are useful for teachers and their students.
 
-Depends:     kdm, kdebase, kde-standard, konqueror, \
+Depends:     kdebase, kde-standard, konqueror, \
              konsole, kmix, kdepasswd, kscreensaver
 Recommends:  kcalc, ark, kmail, kaddressbook, kcharselect, \
              kdf, ksnapshot, korganizer, konversation | kopete, \
@@ -24,11 +24,16 @@
              kmid, kmidi, kruler, kfilereplace, kiconedit, kpm, \
              kdepim-kfile-plugins, kdeaddons-kfile-plugins, \
              kde | kde-full
-Avoid:       xdm
 Why:         KDE desktop environment
 Responsible: ? (someone need to check the package list is complete)
 NeedConfig:  no
 
+Depends:     gdm3
+Avoid:       xdm
+Why:         The KDE desktop environment do not pull in a display manager.
+             Pick gdm3, which is the most feature complete one.
+NeedConfig:  yes, artwork
+
 Depends:     dragonplayer | totem | vlc | kaffeine | audacious | xine-ui | mplayer
 Why:         Prefered video / multimedia player for the KDE environment.
 Responsible: ?

Modified: branches/wheezy/debian-edu/tasks/desktop-lxde
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-lxde	2013-05-29 12:10:40 UTC (rev 80267)
+++ branches/wheezy/debian-edu/tasks/desktop-lxde	2013-05-29 18:27:10 UTC (rev 80268)
@@ -20,10 +20,13 @@
               gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, \
               synaptic
 
+Depends:      gdm3
 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
-Responsible:  Mike Gabriel
-NeedConfig:   no
+NeedConfig:   yes, artwork
 
 Depends:     totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer
 Why:         Prefered video / multimedia player for the LXDE environment.