[debian-edu-commits] r80383 - in branches/wheezy/debian-edu: . debian

[holger at alioth.debian.org]

Author: holger
Date: 2013-06-08 16:19:57 +0000 (Sat, 08 Jun 2013)
New Revision: 80383

Modified:
   branches/wheezy/debian-edu/debian-edu-tasks.desc
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/debian/control
Log:
release as 1.709~svn80382 to wheezy-test

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-06-08 15:54:48 UTC (rev 80382)
+++ branches/wheezy/debian-edu/debian/changelog	2013-06-08 16:19:57 UTC (rev 80383)
@@ -1,10 +1,5 @@
-debian-edu (1.709~svn80337) wheezy-test; urgency=low
+debian-edu (1.709~svn80382) wheezy-test; urgency=low
 
-  * UNRELEASED - the debian-edu package is special, while it's unreleased it
-    has to have the right distro set in the distro field of the unreleased
-    changelog entry, so we add an extra paragraph like this one until it's
-    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
@@ -13,7 +8,7 @@
     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
+ -- Holger Levsen <holger at debian.org>  Sat, 08 Jun 2013 18:18:29 +0200
 
 debian-edu (1.709~svn80336) wheezy-test; urgency=low
 

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-06-08 15:54:48 UTC (rev 80382)
+++ branches/wheezy/debian-edu/debian/control	2013-06-08 16:19:57 UTC (rev 80383)
@@ -70,7 +70,7 @@
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
 Recommends: education-common, gdm3, gimp, gnome-desktop-environment, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, libreoffice-base, libreoffice-calc, libreoffice-draw, libreoffice-filter-binfilter, libreoffice-gnome, libreoffice-gtk, libreoffice-impress, libreoffice-java-common, libreoffice-math, libreoffice-writer, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer
-Suggests: dasher, gnochm, gnome-accessibility-themes, gnome-mag, gnome-orca, gok, iceweasel-gnome-support
+Suggests: dasher, gnochm, gnome-accessibility-themes, gnome-mag, gnome-orca, gok, iceweasel-gnome-support, x-display-manager
 Description: Debian Edu GNOME desktop applications
  This metapackage depends on various GNOME office and desktop applications
  that are useful for teachers and their students.
@@ -79,8 +79,8 @@
 Section: kde
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: amarok, ark, digikam, dragonplayer | totem | vlc | kaffeine | audacious | xine-ui | mplayer, freespacenotifier, gdm3, kaddressbook, kamera, kcalc, kcharselect, kde-l10n-ca, kde-l10n-de, kde-l10n-el, kde-l10n-es, kde-l10n-fr, kde-l10n-it, kde-l10n-lv, kde-l10n-nl, kde-l10n-ptbr, kde-l10n-sv, kde-standard, kdeaccessibility, kdeedu, kdegraphics-strigi-plugins, kdemultimedia-kio-plugins, kdepasswd, kdepimlibs-kio-plugins, kdeutils, kdewallpapers, kdf, kfloppy, kinfocenter, kipi-plugins, kmail, kmix, knotes, konq-plugins, konqueror, konsole, konversation | kopete, korganizer, kscreensaver, ksnapshot, kturtle, kwalletmanager, libreoffice-kde, menu, menu-xdg, printer-applet, update-notifier-kde, virtuoso-minimal
-Suggests: digikamimageplugins, kaddressbook-plugins, kate-plugins, kcron, kde, kde-full, kde-l10n-se, kdeaddons-kfile-plugins, kdebase, kdenetwork-kfile-plugins, kdepim-kfile-plugins, kedit, kfilereplace, kfind, kiconedit, kiosktool, kmid, kmidi, knode, kpaint, kpm, krdc, krecord, krfb, kruler, kscd, kschoolmenu, kuser, kview, noatun, noatun-plugins, quanta
+Recommends: amarok, ark, digikam, dragonplayer | totem | vlc | kaffeine | audacious | xine-ui | mplayer, freespacenotifier, kaddressbook, kamera, kcalc, kcharselect, kde-l10n-ca, kde-l10n-de, kde-l10n-el, kde-l10n-es, kde-l10n-fr, kde-l10n-it, kde-l10n-lv, kde-l10n-nl, kde-l10n-ptbr, kde-l10n-sv, kde-standard, kdeaccessibility, kdeedu, kdegraphics-strigi-plugins, kdemultimedia-kio-plugins, kdepasswd, kdepimlibs-kio-plugins, kdeutils, kdewallpapers, kdf, kdm, kfloppy, kinfocenter, kipi-plugins, kmail, kmix, knotes, konq-plugins, konqueror, konsole, konversation | kopete, korganizer, kscreensaver, ksnapshot, kturtle, kwalletmanager, libreoffice-kde, menu, menu-xdg, printer-applet, update-notifier-kde, virtuoso-minimal
+Suggests: digikamimageplugins, kaddressbook-plugins, kate-plugins, kcron, kde, kde-full, kde-l10n-se, kdeaddons-kfile-plugins, kdebase, kdenetwork-kfile-plugins, kdepim-kfile-plugins, kedit, kfilereplace, kfind, kiconedit, kiosktool, kmid, kmidi, knode, kpaint, kpm, krdc, krecord, krfb, kruler, kscd, kschoolmenu, kuser, kview, noatun, noatun-plugins, quanta, x-display-manager
 Description: Debian Edu KDE desktop applications
  This metapackage depends on various KDE office and desktop applications
  that are useful for teachers and their students.
@@ -89,7 +89,8 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: aqualung, chmsee, desktop-file-utils, education-common, evince-gtk, fotoxx, galculator, gdm3, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lxde, mtpaint, osmo, parcellite, pidgin, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer, xchat
+Recommends: aqualung, chmsee, desktop-file-utils, education-common, evince-gtk, fotoxx, galculator, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lightdm, lxde, mtpaint, osmo, parcellite, pidgin, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer, xchat
+Suggests: x-display-manager
 Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
  desktop applications that are useful for teachers and their students.
@@ -119,7 +120,8 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: dbus-x11, education-common, gdm3, system-config-printer, tango-icon-theme, xfce4, xfce4-goodies
+Recommends: dbus-x11, education-common, lightdm, system-config-printer, tango-icon-theme, xfce4, xfce4-goodies
+Suggests: x-display-manager
 Description: Debian Edu Xfce desktop applications
  This metapackage depends on various XFCE components that are useful
  for teachers and their students.

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-06-08 15:54:48 UTC (rev 80382)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-06-08 16:19:57 UTC (rev 80383)
@@ -129,7 +129,7 @@
  kmix
  kdepasswd
  kscreensaver
- gdm3
+ kdm
  dragonplayer
  kdeedu
  menu
@@ -278,7 +278,7 @@
  bash-completion
  lxde
  desktop-file-utils
- gdm3
+ lightdm
  totem
  aqualung
  evince-gtk
@@ -742,7 +742,7 @@
  bash-completion
  xfce4
  xfce4-goodies
- gdm3
+ lightdm
  system-config-printer
  tango-icon-theme
  dbus-x11