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

Tue Apr 23 22:40:40 UTC 2013

Author: holger
Date: 2013-04-23 22:40:40 +0000 (Tue, 23 Apr 2013)
New Revision: 79749

Modified:
   branches/wheezy/debian-edu/debian-edu-tasks.desc
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/debian/control
Log:
upload to sid and wheezy-test as 1.704, containing these changes:

* uploaded to the Debian Edu archive as 1.704~svn79606:
* uploaded to the Debian Edu archive as 1.704~svn79605:
* uploaded to the Debian Edu archive as 1.704~svn79539:
* uploaded to the Debian Edu archive as 1.704~svn79477:

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

--- branches/wheezy/debian-edu/debian/changelog	2013-04-23 19:32:51 UTC (rev 79748)
+++ branches/wheezy/debian-edu/debian/changelog	2013-04-23 22:40:40 UTC (rev 79749)
@@ -1,9 +1,6 @@
-debian-edu (1.704~svn79606) wheezy-test; urgency=low
+debian-edu (1.704) unstable; 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.
+  * uploaded to the Debian Edu archive as 1.704~svn79606:
 
   [ Petter Reinholdtsen ]
   * Depend on scratch in the education-misc task, to put it on our
@@ -14,10 +11,8 @@
     much packages belonging to desktop-gnome. Remove lightdm from
     avoids, cause lightdm will be used as display manager.
 
- -- Holger Levsen <holger at debian.org>  Thu, 11 Apr 2013 13:42:36 +0200
+  * uploaded to the Debian Edu archive as 1.704~svn79605:
 
-debian-edu (1.704~svn79605) wheezy-test; urgency=low
-
   [ Wolfgang Schweer ]
   * Replace gdm with gdm3, cause gdm isn't available anymore: 
     - Replace gdm with gdm3 in task files desktop-gnome, desktop-lxde,
@@ -31,18 +26,14 @@
   * Downgrade ejs (task physics) from Depends to Suggests, cause a
     Debian package isn't available.
 
- -- Holger Levsen <holger at debian.org>  Fri, 29 Mar 2013 13:49:40 +0100
+  * uploaded to the Debian Edu archive as 1.704~svn79539:
 
-debian-edu (1.704~svn79539) wheezy-test; urgency=low
-
   [ Wolfgang Schweer ]
   * Add dnsutils and iputils-ping to thin-client depends, as dig and ping
     are required for init-ltsp to work properly.
 
- -- Holger Levsen <holger at debian.org>  Fri, 29 Mar 2013 13:14:12 +0100
+  * uploaded to the Debian Edu archive as 1.704~svn79477:
 
-debian-edu (1.704~svn79477) wheezy-test; urgency=low
-
   [ Wolfgang Schweer ]
   * Move from openoffice.org to libreoffice in task files.
     - Rename most package names.
@@ -50,7 +41,7 @@
       openoffice.org in their names, so keep those.
     - Replace mozilla-openoffice.org with browser-plugin-libreoffice.
 
- -- Holger Levsen <holger at debian.org>  Tue, 26 Mar 2013 10:22:56 +0100
+ -- Holger Levsen <holger at debian.org>  Wed, 24 Apr 2013 00:26:06 +0200
 
 debian-edu (1.703) unstable; urgency=low
 

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-04-23 19:32:51 UTC (rev 79748)
+++ branches/wheezy/debian-edu/debian/control	2013-04-23 22:40:40 UTC (rev 79749)
@@ -90,7 +90,7 @@
 Section: x11
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-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
+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
 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.
@@ -185,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-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
+Recommends: apache2, atftpd | tftpd-hpa, bind9 | pdns-backend-ldap, 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-config-gosa-netgroups, 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.
@@ -203,7 +203,7 @@
 Package: education-misc
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: childsplay, education-menus, gcompris, pysycache, tilp, tuxpaint, tuxtype, vym
+Recommends: childsplay, education-menus, gcompris, pysycache, scratch, tilp, tuxpaint, tuxtype, vym
 Suggests: blinken, flashkard, flashplugin-nonfree, ggradebook, jclic, keduca, ksociograma
 Description: Debian Edu miscellaneous applications for education
  This metapackage depends on miscellaneous applications that can be useful

Modified: branches/wheezy/debian-edu/debian-edu-tasks.desc
===================================================================
--- branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-04-23 19:32:51 UTC (rev 79748)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-04-23 22:40:40 UTC (rev 79749)
@@ -280,7 +280,6 @@
  libpam-tmpdir
  readahead-fedora
  bash-completion
- gdm3
  lxde
  desktop-file-utils
  totem
@@ -523,6 +522,7 @@
  tilp
  vym
  pysycache
+ scratch
  gtk-recordmydesktop
  pavucontrol
 
@@ -1178,7 +1178,6 @@
  gosa-help-de
  gosa-help-fr
  gosa-help-nl
- debian-edu-config-gosa-netgroups
  gosa-plugin-goto
  krb5-kdc
  krb5-admin-server
@@ -1639,6 +1638,7 @@
  tilp
  vym
  pysycache
+ scratch
  gtk-recordmydesktop
  pavucontrol
  wicd
@@ -1959,6 +1959,7 @@
  tilp
  vym
  pysycache
+ scratch
  gtk-recordmydesktop
  pavucontrol
  sudo
@@ -2329,6 +2330,7 @@
  tilp
  vym
  pysycache
+ scratch
  gtk-recordmydesktop
  pavucontrol
  krb5-auth-dialog
@@ -2678,6 +2680,7 @@
  tilp
  vym
  pysycache
+ scratch
  gtk-recordmydesktop
  pavucontrol
  krb5-auth-dialog


