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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-08 10:17:50 +0000 (Sat, 08 Jun 2013)
New Revision: 80366

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/desktop-gnome
   branches/wheezy/debian-edu/tasks/desktop-kde
   branches/wheezy/debian-edu/tasks/desktop-lxde
   branches/wheezy/debian-edu/tasks/desktop-xfce
Log:
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.

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-06-08 08:16:11 UTC (rev 80365)
+++ branches/wheezy/debian-edu/debian/changelog	2013-06-08 10:17:50 UTC (rev 80366)
@@ -5,6 +5,11 @@
     changelog entry, so we add an extra paragraph like this one until it's
     uploaded.
 
+  [ Petter Reinholdtsen ]
+  * 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.
+
  -- Holger Levsen <holger at debian.org>  Fri, 07 Jun 2013 16:23:52 +0200
 
 debian-edu (1.709~svn80336) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu/tasks/desktop-gnome
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-gnome	2013-06-08 08:16:11 UTC (rev 80365)
+++ branches/wheezy/debian-edu/tasks/desktop-gnome	2013-06-08 10:17:50 UTC (rev 80366)
@@ -12,7 +12,8 @@
 Responsible: José L. Redrejo Rodríguez
 NeedConfig:  no
 
-Depends:      gdm3, iceweasel-gnome-support, gnome-desktop-environment, gimp, \
+Depends:      gdm3 | x-display-manager, \
+              iceweasel-gnome-support, gnome-desktop-environment, gimp, \
               inkscape, gnochm, gstreamer0.10-ffmpeg, \
               gstreamer0.10-pulseaudio, synaptic
 Suggests:     dasher, gnome-mag, gok, \

Modified: branches/wheezy/debian-edu/tasks/desktop-kde
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-kde	2013-06-08 08:16:11 UTC (rev 80365)
+++ branches/wheezy/debian-edu/tasks/desktop-kde	2013-06-08 10:17:50 UTC (rev 80366)
@@ -28,7 +28,7 @@
 Responsible: ? (someone need to check the package list is complete)
 NeedConfig:  no
 
-Depends:     gdm3
+Depends:     gdm3 | 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.

Modified: branches/wheezy/debian-edu/tasks/desktop-lxde
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-lxde	2013-06-08 08:16:11 UTC (rev 80365)
+++ branches/wheezy/debian-edu/tasks/desktop-lxde	2013-06-08 10:17:50 UTC (rev 80366)
@@ -20,7 +20,7 @@
               gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, \
               synaptic
 
-Depends:      gdm3
+Depends:      gdm3 | 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

Modified: branches/wheezy/debian-edu/tasks/desktop-xfce
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-xfce	2013-06-08 08:16:11 UTC (rev 80365)
+++ branches/wheezy/debian-edu/tasks/desktop-xfce	2013-06-08 10:17:50 UTC (rev 80366)
@@ -15,7 +15,7 @@
 Depends:      xfce4, xfce4-goodies
 Why:          The Xfce desktop environment.
 
-Depends:      gdm3
+Depends:      gdm3 | x-display-manager
 Why:          The Xfce desktop environment do not pull in a display manager.
               Pick gdm3, which is the most feature complete one.