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

Thu Apr 11 10:29:01 UTC 2013

Author: holger
Date: 2013-04-11 10:29:01 +0000 (Thu, 11 Apr 2013)
New Revision: 79605

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.704~svn79605 to wheezy-test

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================

--- branches/wheezy/debian-edu/debian/changelog	2013-04-11 10:21:15 UTC (rev 79604)
+++ branches/wheezy/debian-edu/debian/changelog	2013-04-11 10:29:01 UTC (rev 79605)
@@ -1,11 +1,5 @@
-debian-edu (1.704~svn79540) wheezy-test; urgency=low
+debian-edu (1.704~svn79605) wheezy-test; urgency=low
 
-  [ Holger Levsen ]
-  * 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.
-
   [ Wolfgang Schweer ]
   * Replace gdm with gdm3, cause gdm isn't available anymore: 
     - Replace gdm with gdm3 in task files desktop-gnome, desktop-lxde,

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-04-11 10:21:15 UTC (rev 79604)
+++ branches/wheezy/debian-edu/debian/control	2013-04-11 10:29:01 UTC (rev 79605)
@@ -70,8 +70,8 @@
 Section: gnome
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: education-common, 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, gdm, gnochm, gnome-accessibility-themes, gnome-mag, gnome-orca, gok, iceweasel-gnome-support
+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
 Description: Debian Edu GNOME desktop applications
  This metapackage depends on various GNOME office and desktop applications
  that are useful for teachers and their students.
@@ -90,8 +90,7 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: aqualung, chmsee, desktop-file-utils, education-common, epdfview, fotoxx, galculator, gimp, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, inkscape, lxde, mtpaint, osmo, parcellite, pidgin, synaptic, totem | dragonplayer | vlc | kaffeine | audacious | xine-ui | mplayer, xchat
-Suggests: gdm
+Recommends: aqualung, chmsee, desktop-file-utils, education-common, epdfview, 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
 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.
@@ -109,8 +108,8 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: avahi-daemon, education-common, gstreamer0.10-plugins-good, net-tools, network-manager, openssh-client, python-gst0.10, sugar-calculate-activity, sugar-irc-activity, sugar-physics-activity, sugar-pippy-activity, sugar-record-activity, sugar-turtleart-activity, ttf-dejavu-extra, x11-xserver-utils, xinit, xorg, xserver-xephyr, xserver-xorg
-Suggests: etoys, etoys-doc, gdm, squeak-vm, sucrose-0.88, sugar-browse-activity-0.86, sugar-chat-activity-0.86, sugar-doc, sugar-emulator-0.88, sugar-read-activity-0.86, sugar-session-0.88, sugar-write-activity-0.88
+Recommends: avahi-daemon, education-common, gdm3, gstreamer0.10-plugins-good, net-tools, network-manager, openssh-client, python-gst0.10, sugar-calculate-activity, sugar-irc-activity, sugar-physics-activity, sugar-pippy-activity, sugar-record-activity, sugar-turtleart-activity, ttf-dejavu-extra, x11-xserver-utils, xinit, xorg, xserver-xephyr, xserver-xorg
+Suggests: etoys, etoys-doc, squeak-vm, sucrose-0.88, sugar-browse-activity-0.86, sugar-chat-activity-0.86, sugar-doc, sugar-emulator-0.88, sugar-read-activity-0.86, sugar-session-0.88, sugar-write-activity-0.88
 Description: Debian Edu sugar desktop environment
  This metapackage depends on various sugar applications. Sugar is a
  graphical user interface aimed at children which promotes sharing and
@@ -186,8 +185,8 @@
 Package: education-main-server
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: apache2, atftpd | tftpd-hpa, bind9 | pdns-backend-ldap, debian-edu-config-gosa-netgroups, dovecot-gssapi, dovecot-imapd, education-networked, exim4-daemon-heavy, gosa, gosa-help-de, gosa-help-en, gosa-help-fr, gosa-help-nl, gosa-plugin-dhcp, gosa-plugin-dhcp-schema, gosa-plugin-dns, gosa-plugin-dns-schema, gosa-plugin-ldapmanager, gosa-plugin-samba, gosa-plugin-sudo, gosa-plugin-sudo-schema, gosa-schema, iptables, isc-dhcp-server-ldap, krb5-admin-server, krb5-kdc, krb5-kdc-ldap, ldap2zone | pdns-recursor, libapache2-mod-auth-kerb, libsasl2-modules-gssapi-mit, links, makepasswd, memtest86+, munin, nagios-nrpe-plugin, nagios-plugins-standard, nagios3, nfs-kernel-server, ntp, openssl, samba, samba-common-bin, sitesummary, slapd, slbackup, slbackup-php, smbclient, smbldap-tools, squid, syslinux, tdb-tools
-Suggests: apache2-doc, calamaris, debian-edu-fr-all, debian-edu-fr-skels, debian-installer-6.0-netboot-amd64, debian-installer-6.0-netboot-i386, dlint, dnswalk, dovecot-pop3d, dsh, gosa-plugin-goto, krb5-doc, libsasl2-modules-ldap, lwat, mysql-client, nagios3-doc, nfs-server, nslint, ocsinventory-reports, ocsinventory-server, samba-doc, sarg, squidguard, webalizer
+Recommends: apache2, atftpd | tftpd-hpa, bind9 | pdns-backend-ldap, debian-edu-config-gosa-netgroups, dovecot-gssapi, dovecot-imapd, education-networked, exim4-daemon-heavy, gosa, gosa-help-de, gosa-help-en, gosa-help-fr, gosa-help-nl, gosa-plugin-dhcp, gosa-plugin-dhcp-schema, gosa-plugin-dns, gosa-plugin-dns-schema, gosa-plugin-goto, gosa-plugin-ldapmanager, gosa-plugin-samba, gosa-plugin-sudo, gosa-plugin-sudo-schema, gosa-schema, iptables, isc-dhcp-server-ldap, krb5-admin-server, krb5-kdc, krb5-kdc-ldap, ldap2zone | pdns-recursor, libapache2-mod-auth-kerb, libsasl2-modules-gssapi-mit, links, makepasswd, memtest86+, munin, nagios-nrpe-plugin, nagios-plugins-standard, nagios3, nfs-kernel-server, ntp, openssl, samba, samba-common-bin, sitesummary, slapd, slbackup, slbackup-php, smbclient, smbldap-tools, squid, syslinux, tdb-tools
+Suggests: apache2-doc, calamaris, debian-edu-fr-all, debian-edu-fr-skels, debian-installer-6.0-netboot-amd64, debian-installer-6.0-netboot-i386, dlint, dnswalk, dovecot-pop3d, dsh, krb5-doc, libsasl2-modules-ldap, lwat, mysql-client, nagios3-doc, nfs-server, nslint, ocsinventory-reports, ocsinventory-server, samba-doc, sarg, squidguard, webalizer
 Description: Debian Edu main server packages
  A metapackage containing dependencies for packages required on all
  main server installations in the Debian Edu Blend.

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-04-11 10:21:15 UTC (rev 79604)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-04-11 10:29:01 UTC (rev 79605)
@@ -95,6 +95,7 @@
  libpam-tmpdir
  readahead-fedora
  bash-completion
+ gdm3
  gnome-desktop-environment
  gimp
  inkscape
@@ -279,6 +280,7 @@
  libpam-tmpdir
  readahead-fedora
  bash-completion
+ gdm3
  lxde
  desktop-file-utils
  totem
@@ -625,6 +627,7 @@
  xserver-xorg
  xinit
  xorg
+ gdm3
  sugar-calculate-activity
  sugar-pippy-activity
  sugar-turtleart-activity
@@ -1176,6 +1179,7 @@
  gosa-help-fr
  gosa-help-nl
  debian-edu-config-gosa-netgroups
+ gosa-plugin-goto
  krb5-kdc
  krb5-admin-server
  krb5-kdc-ldap


