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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-22 04:21:52 +0000 (Sat, 22 Jun 2013)
New Revision: 81080

Modified:
   branches/wheezy/debian-edu/debian-edu-tasks.desc
   branches/wheezy/debian-edu/debian/control
Log:
Generated.

Modified: branches/wheezy/debian-edu/debian/control
===================================================================
--- branches/wheezy/debian-edu/debian/control	2013-06-21 21:03:09 UTC (rev 81079)
+++ branches/wheezy/debian-edu/debian/control	2013-06-22 04:21:52 UTC (rev 81080)
@@ -129,8 +129,8 @@
 Package: education-development
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: autoconf, bluefish, build-essential, bwbasic, ddd, drpython, education-menus, fp-compiler, fp-docs, fp-ide, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gfx, fp-units-gtk2, fp-units-misc, fp-units-multimedia, fp-units-net, fp-units-rtl, fp-utils, fpc-source, gvrng, kdevelop, kommander, kturtle, lazarus, python, python-easygui, squeak-vm, subversion, umbrello
-Suggests: eclipse, fp-units-i386, gambas2, quanta, swi-prolog, swi-prolog-clib, swi-prolog-doc, swi-prolog-http, swi-prolog-semweb, swi-prolog-sgml, swi-prolog-table, swi-prolog-xpce, tcl8.5-dev, tk8.5-dev
+Recommends: autoconf, bluefish, build-essential, bwbasic, ddd, drpython, education-menus, fp-compiler, fp-docs, fp-ide, fp-units-base, fp-units-fcl, fp-units-fv, fp-units-gfx, fp-units-gtk2, fp-units-i386, fp-units-misc, fp-units-multimedia, fp-units-net, fp-units-rtl, fp-utils, fpc-source, gvrng, kdevelop, kommander, kturtle, lazarus, python, python-easygui, squeak-vm, subversion, umbrello
+Suggests: eclipse, gambas2, quanta, swi-prolog, swi-prolog-clib, swi-prolog-doc, swi-prolog-http, swi-prolog-semweb, swi-prolog-sgml, swi-prolog-table, swi-prolog-xpce, tcl8.5-dev, tk8.5-dev
 Description: Debian Edu software development related educational applications
  This metapackage depends on various applications that can be used to
  develop applications in schools.  The idea is to support integrated
@@ -195,8 +195,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, debian-edu-config-gosa-netgroups, debian-installer-7.0-netboot-amd64, debian-installer-7.0-netboot-i386, 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, 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-06-21 21:03:09 UTC (rev 81079)
+++ branches/wheezy/debian-edu/debian-edu-tasks.desc	2013-06-22 04:21:52 UTC (rev 81080)
@@ -1212,6 +1212,8 @@
  ldap2zone
  isc-dhcp-server-ldap
  syslinux
+ debian-installer-7.0-netboot-i386
+ debian-installer-7.0-netboot-amd64
  atftpd
  slapd
  openssl