[debian-edu-commits] debian-edu/ 01/01: Generated.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu.

commit fc3b65d097f880d0ac5976d4a87a7b962f58973e
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Sep 5 14:14:38 2014 +0200

    Generated.
---
 debian-edu-tasks.desc | 11 +----------
 debian/control        |  8 ++++----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index a9c9e3d..8e08e2e 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -445,8 +445,6 @@ Packages: list
  gcj-jre-headless
  libreoffice
  gecko-mediaplayer
- konqueror-plugin-gnash
- browser-plugin-gnash
  debian-edu-artwork
  gnupg2
  gnupg-agent
@@ -1348,6 +1346,7 @@ Packages: list
  slbackup
  slbackup-php
  munin
+ nagios3
  nagios-plugins-standard
  nagios-nrpe-plugin
  sitesummary
@@ -1625,8 +1624,6 @@ Packages: list
  gcj-jre-headless
  libreoffice
  gecko-mediaplayer
- konqueror-plugin-gnash
- browser-plugin-gnash
  debian-edu-artwork
  gnupg2
  gnupg-agent
@@ -1930,8 +1927,6 @@ Packages: list
  gcj-jre-headless
  libreoffice
  gecko-mediaplayer
- konqueror-plugin-gnash
- browser-plugin-gnash
  debian-edu-artwork
  gnupg2
  gnupg-agent
@@ -2283,8 +2278,6 @@ Packages: list
  gcj-jre-headless
  libreoffice
  gecko-mediaplayer
- konqueror-plugin-gnash
- browser-plugin-gnash
  debian-edu-artwork
  gnupg2
  gnupg-agent
@@ -2616,8 +2609,6 @@ Packages: list
  gcj-jre-headless
  libreoffice
  gecko-mediaplayer
- konqueror-plugin-gnash
- browser-plugin-gnash
  debian-edu-artwork
  gnupg2
  gnupg-agent
diff --git a/debian/control b/debian/control
index 18897b5..e692b7e 100644
--- a/debian/control
+++ b/debian/control
@@ -111,8 +111,8 @@ Package: education-desktop-other
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: alsa-base, alsa-utils, avahi-daemon, browser-plugin-gnash | mozilla-plugin-gnash, browser-plugin-libreoffice, bzip2, cheese, chromium, cups-bsd, cups-client, debian-edu-artwork, default-jre, djview-plugin, dvgrab, education-astronomy, education-chemistry, education-electronics, education-geography, education-graphics, education-language, education-logic-games, education-mathematics, education-misc, education-music, education-physics, fonts-freefont-ttf, fonts-liberation, font [...]
-Suggests: adept, atlantik, atlantikdesigner, auctex, avahi-autoipd, avahi-discover, controlaula, dbdesigner, dhcp3-client, dia, fet, flashplugin-nonfree, flashplugin-nonfree-pulse, fonts-arphic-uming, fonts-larabie-deco, fonts-mlym, foomatic-gui, gcompris-sound-cs, gcompris-sound-de, gcompris-sound-en, gcompris-sound-es, gcompris-sound-eu, gcompris-sound-fi, gcompris-sound-fr, gcompris-sound-hu, gcompris-sound-it, gcompris-sound-mr, gcompris-sound-nl, gcompris-sound-pt, gcompris-sound-pt [...]
+Recommends: alsa-base, alsa-utils, avahi-daemon, browser-plugin-libreoffice, bzip2, cheese, chromium, cups-bsd, cups-client, debian-edu-artwork, default-jre, djview-plugin, dvgrab, education-astronomy, education-chemistry, education-electronics, education-geography, education-graphics, education-language, education-logic-games, education-mathematics, education-misc, education-music, education-physics, fonts-freefont-ttf, fonts-liberation, fonts-linex, fonts-mgopen, freerdp-x11 | rdesktop [...]
+Suggests: adept, atlantik, atlantikdesigner, auctex, avahi-autoipd, avahi-discover, browser-plugin-gnash, controlaula, dbdesigner, dhcp3-client, dia, fet, flashplugin-nonfree, flashplugin-nonfree-pulse, fonts-arphic-uming, fonts-larabie-deco, fonts-mlym, foomatic-gui, gcompris-sound-cs, gcompris-sound-de, gcompris-sound-en, gcompris-sound-es, gcompris-sound-eu, gcompris-sound-fi, gcompris-sound-fr, gcompris-sound-hu, gcompris-sound-it, gcompris-sound-mr, gcompris-sound-nl, gcompris-sound [...]
 Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
@@ -216,8 +216,8 @@ Package: education-main-server
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-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-sche [...]
-Suggests: apache2-doc, calamaris, debian-edu-fr-all, debian-edu-fr-skels, dlint, dnswalk, dovecot-pop3d, dsh, krb5-doc, libsasl2-modules-ldap, mysql-client, nagios3, 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-sche [...]
+Suggests: apache2-doc, calamaris, debian-edu-fr-all, debian-edu-fr-skels, dlint, dnswalk, dovecot-pop3d, dsh, krb5-doc, libsasl2-modules-ldap, 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git