[debian-edu-commits] debian-edu/ 01/01: Remove no longer available package readahead-fedora from tasks/common.

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Tue Apr 12 19:00:18 UTC 2016


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

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

commit fea1474701dffe3db19511eaf27df207af1db89c
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Apr 12 21:02:12 2016 +0200

    Remove no longer available package readahead-fedora from tasks/common.
---
 debian-edu-tasks.desc | 112 ++++++++++++++++++++---------------------------
 debian/changelog      |   1 +
 debian/control        | 118 +++++++++++++++++++++++++++++---------------------
 tasks/common          |   5 ---
 4 files changed, 116 insertions(+), 120 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 3dec2d6..932083a 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -100,7 +100,6 @@ Packages: list
  gnome
  gimp
  inkscape
- gstreamer0.10-pulseaudio
  synaptic
  libreoffice-gnome
  libreoffice-gtk
@@ -217,8 +216,6 @@ Packages: list
  konsole
  kmix
  kdepasswd
- kscreensaver
- kdm
  dragonplayer
  kdeedu
  kcalc
@@ -237,7 +234,7 @@ Packages: list
  kdepimlibs-kio-plugins
  kfloppy
  knotes
- amarok
+ clementine
  kdewallpapers
  kdeutils
  kamera
@@ -253,9 +250,9 @@ Packages: list
  bluedevil
  kwalletmanager
  virtuoso-minimal
- freespacenotifier
  kinfocenter
  printer-applet
+ freespacenotifier
  update-notifier-kde
  quanta
  krfb
@@ -381,15 +378,15 @@ Packages: list
  osmo
  parcellite
  pidgin
- xchat
  mtpaint
  fotoxx
  gimp
  inkscape
- gstreamer0.10-pulseaudio
  synaptic
  aqualung
+ xchat
  gstreamer0.10-ffmpeg
+ gstreamer0.10-pulseaudio
  blueman
  ssh-askpass
 
@@ -494,8 +491,6 @@ Packages: list
  lightdm
  mate-desktop-environment
  mate-desktop-environment-extras
- mate-settings-daemon-pulse
- mate-media-pulse
  gimp
  inkscape
  synaptic
@@ -537,11 +532,11 @@ Packages: list
  alsa-base
  gcj-jre-headless
  libreoffice
- gecko-mediaplayer
  debian-edu-artwork
  gnupg2
  gnupg-agent
  avahi-daemon
+ libnss-mdns
  cups-client
  cups-bsd
  unzip
@@ -552,7 +547,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -568,17 +562,17 @@ Packages: list
  libreoffice-help-es
  libreoffice-help-sv
  libreoffice-help-pt-br
- browser-plugin-libreoffice
  openclipart-libreoffice
  openclipart
  libreoffice-help-en
+ browser-plugin-libreoffice
  gstreamer0.10-alsa
+ gstreamer0.10-esd
+ gstreamer0.10-ffmpeg
  gstreamer0.10-x
  gstreamer0.10-plugins-base
  gstreamer0.10-plugins-good
  gstreamer0.10-plugins-ugly
- gstreamer0.10-esd
- gstreamer0.10-ffmpeg
  iceweasel
  iceweasel-l10n-de
  iceweasel-l10n-el
@@ -614,7 +608,6 @@ Packages: list
  sane-utils
  skanlite
  ocrad
- myspell-en-us
  myspell-en-gb
  myspell-de-de
  myspell-fr
@@ -626,11 +619,11 @@ Packages: list
  myspell-nl
  myspell-pt-pt
  tmispell-voikko
+ myspell-en-us
  k3b
  k3b-i18n
  tuxmath
  education-astronomy
- celestia-gnome
  gpredict
  stellarium
  xplanet
@@ -641,6 +634,7 @@ Packages: list
  easychem
  gchempaint
  gdis
+ ghemical
  pymol
  viewmol
  gperiodic
@@ -682,7 +676,6 @@ Packages: list
  gnuplot
  kbruch
  kmplot
- mathwar
  rocs
  kig
  geomview
@@ -694,9 +687,9 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  denemo
- solfege
  audacious
  lmms
  gtick
@@ -714,7 +707,6 @@ Packages: list
  planets
  step
  education-misc
- childsplay
  tuxtype
  tilp2
  pysycache
@@ -1304,6 +1296,8 @@ Packages: list
  network-manager
  gosa-desktop
  iptables
+ avahi-daemon
+ libnss-mdns
  bind9
  ldap2zone
  isc-dhcp-server-ldap
@@ -1311,7 +1305,7 @@ Packages: list
  syslinux-common
  debian-installer-8-netboot-i386
  debian-installer-8-netboot-amd64
- atftpd
+ tftpd-hpa
  slapd
  openssl
  dovecot-imapd
@@ -1325,7 +1319,7 @@ Packages: list
  tdb-tools
  smbclient
  apache2
- squid3
+ squid
  slbackup
  slbackup-php
  munin
@@ -1610,11 +1604,11 @@ Packages: list
  alsa-base
  gcj-jre-headless
  libreoffice
- gecko-mediaplayer
  debian-edu-artwork
  gnupg2
  gnupg-agent
  avahi-daemon
+ libnss-mdns
  cups-client
  cups-bsd
  unzip
@@ -1625,7 +1619,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -1641,17 +1634,17 @@ Packages: list
  libreoffice-help-es
  libreoffice-help-sv
  libreoffice-help-pt-br
- browser-plugin-libreoffice
  openclipart-libreoffice
  openclipart
  libreoffice-help-en
+ browser-plugin-libreoffice
  gstreamer0.10-alsa
+ gstreamer0.10-esd
+ gstreamer0.10-ffmpeg
  gstreamer0.10-x
  gstreamer0.10-plugins-base
  gstreamer0.10-plugins-good
  gstreamer0.10-plugins-ugly
- gstreamer0.10-esd
- gstreamer0.10-ffmpeg
  iceweasel
  iceweasel-l10n-de
  iceweasel-l10n-el
@@ -1687,7 +1680,6 @@ Packages: list
  sane-utils
  skanlite
  ocrad
- myspell-en-us
  myspell-en-gb
  myspell-de-de
  myspell-fr
@@ -1699,11 +1691,11 @@ Packages: list
  myspell-nl
  myspell-pt-pt
  tmispell-voikko
+ myspell-en-us
  k3b
  k3b-i18n
  tuxmath
  education-astronomy
- celestia-gnome
  gpredict
  stellarium
  xplanet
@@ -1714,6 +1706,7 @@ Packages: list
  easychem
  gchempaint
  gdis
+ ghemical
  pymol
  viewmol
  gperiodic
@@ -1755,7 +1748,6 @@ Packages: list
  gnuplot
  kbruch
  kmplot
- mathwar
  rocs
  kig
  geomview
@@ -1767,9 +1759,9 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  denemo
- solfege
  audacious
  lmms
  gtick
@@ -1787,7 +1779,6 @@ Packages: list
  planets
  step
  education-misc
- childsplay
  tuxtype
  tilp2
  pysycache
@@ -1797,7 +1788,6 @@ Packages: list
  pavucontrol
  goplay
  network-manager-gnome
- libnss-mdns
  libpam-mklocaluser
  libpam-sss
  libnss-sss
@@ -1918,11 +1908,11 @@ Packages: list
  alsa-base
  gcj-jre-headless
  libreoffice
- gecko-mediaplayer
  debian-edu-artwork
  gnupg2
  gnupg-agent
  avahi-daemon
+ libnss-mdns
  cups-client
  cups-bsd
  unzip
@@ -1933,7 +1923,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -1949,17 +1938,17 @@ Packages: list
  libreoffice-help-es
  libreoffice-help-sv
  libreoffice-help-pt-br
- browser-plugin-libreoffice
  openclipart-libreoffice
  openclipart
  libreoffice-help-en
+ browser-plugin-libreoffice
  gstreamer0.10-alsa
+ gstreamer0.10-esd
+ gstreamer0.10-ffmpeg
  gstreamer0.10-x
  gstreamer0.10-plugins-base
  gstreamer0.10-plugins-good
  gstreamer0.10-plugins-ugly
- gstreamer0.10-esd
- gstreamer0.10-ffmpeg
  iceweasel
  iceweasel-l10n-de
  iceweasel-l10n-el
@@ -1995,7 +1984,6 @@ Packages: list
  sane-utils
  skanlite
  ocrad
- myspell-en-us
  myspell-en-gb
  myspell-de-de
  myspell-fr
@@ -2007,11 +1995,11 @@ Packages: list
  myspell-nl
  myspell-pt-pt
  tmispell-voikko
+ myspell-en-us
  k3b
  k3b-i18n
  tuxmath
  education-astronomy
- celestia-gnome
  gpredict
  stellarium
  xplanet
@@ -2022,6 +2010,7 @@ Packages: list
  easychem
  gchempaint
  gdis
+ ghemical
  pymol
  viewmol
  gperiodic
@@ -2063,7 +2052,6 @@ Packages: list
  gnuplot
  kbruch
  kmplot
- mathwar
  rocs
  kig
  geomview
@@ -2075,9 +2063,9 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  denemo
- solfege
  audacious
  lmms
  gtick
@@ -2095,7 +2083,6 @@ Packages: list
  planets
  step
  education-misc
- childsplay
  tuxtype
  tilp2
  pysycache
@@ -2105,8 +2092,7 @@ Packages: list
  pavucontrol
  goplay
  sudo
- plasma-widget-networkmanagement
- libnss-mdns
+ network-manager-gnome
 
 Task: education-thin-client
 Section: debian-edu
@@ -2138,7 +2124,7 @@ Key:
 Packages: list
  iptables
  isc-dhcp-server-ldap
- atftpd
+ tftpd-hpa
  tftp-hpa
  ltsp-server-standalone
  ltspfs
@@ -2274,11 +2260,11 @@ Packages: list
  alsa-base
  gcj-jre-headless
  libreoffice
- gecko-mediaplayer
  debian-edu-artwork
  gnupg2
  gnupg-agent
  avahi-daemon
+ libnss-mdns
  cups-client
  cups-bsd
  unzip
@@ -2289,7 +2275,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -2305,17 +2290,17 @@ Packages: list
  libreoffice-help-es
  libreoffice-help-sv
  libreoffice-help-pt-br
- browser-plugin-libreoffice
  openclipart-libreoffice
  openclipart
  libreoffice-help-en
+ browser-plugin-libreoffice
  gstreamer0.10-alsa
+ gstreamer0.10-esd
+ gstreamer0.10-ffmpeg
  gstreamer0.10-x
  gstreamer0.10-plugins-base
  gstreamer0.10-plugins-good
  gstreamer0.10-plugins-ugly
- gstreamer0.10-esd
- gstreamer0.10-ffmpeg
  iceweasel
  iceweasel-l10n-de
  iceweasel-l10n-el
@@ -2351,7 +2336,6 @@ Packages: list
  sane-utils
  skanlite
  ocrad
- myspell-en-us
  myspell-en-gb
  myspell-de-de
  myspell-fr
@@ -2363,11 +2347,11 @@ Packages: list
  myspell-nl
  myspell-pt-pt
  tmispell-voikko
+ myspell-en-us
  k3b
  k3b-i18n
  tuxmath
  education-astronomy
- celestia-gnome
  gpredict
  stellarium
  xplanet
@@ -2378,6 +2362,7 @@ Packages: list
  easychem
  gchempaint
  gdis
+ ghemical
  pymol
  viewmol
  gperiodic
@@ -2419,7 +2404,6 @@ Packages: list
  gnuplot
  kbruch
  kmplot
- mathwar
  rocs
  kig
  geomview
@@ -2431,9 +2415,9 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  denemo
- solfege
  audacious
  lmms
  gtick
@@ -2451,7 +2435,6 @@ Packages: list
  planets
  step
  education-misc
- childsplay
  tuxtype
  tilp2
  pysycache
@@ -2462,10 +2445,10 @@ Packages: list
  goplay
  krb5-auth-dialog
  jxplorer
- gstreamer0.10-pulseaudio
  pulseaudio
  pulseaudio-esound-compat
  pulseaudio-utils
+ gstreamer0.10-pulseaudio
  nagios-nrpe-server
  nagios-plugins-standard
  xrdp
@@ -2611,11 +2594,11 @@ Packages: list
  alsa-base
  gcj-jre-headless
  libreoffice
- gecko-mediaplayer
  debian-edu-artwork
  gnupg2
  gnupg-agent
  avahi-daemon
+ libnss-mdns
  cups-client
  cups-bsd
  unzip
@@ -2626,7 +2609,6 @@ Packages: list
  ktuberling
  openshot
  kdenlive
- stopmotion
  gcompris
  inkscape
  libreoffice-l10n-el
@@ -2642,17 +2624,17 @@ Packages: list
  libreoffice-help-es
  libreoffice-help-sv
  libreoffice-help-pt-br
- browser-plugin-libreoffice
  openclipart-libreoffice
  openclipart
  libreoffice-help-en
+ browser-plugin-libreoffice
  gstreamer0.10-alsa
+ gstreamer0.10-esd
+ gstreamer0.10-ffmpeg
  gstreamer0.10-x
  gstreamer0.10-plugins-base
  gstreamer0.10-plugins-good
  gstreamer0.10-plugins-ugly
- gstreamer0.10-esd
- gstreamer0.10-ffmpeg
  iceweasel
  iceweasel-l10n-de
  iceweasel-l10n-el
@@ -2688,7 +2670,6 @@ Packages: list
  sane-utils
  skanlite
  ocrad
- myspell-en-us
  myspell-en-gb
  myspell-de-de
  myspell-fr
@@ -2700,11 +2681,11 @@ Packages: list
  myspell-nl
  myspell-pt-pt
  tmispell-voikko
+ myspell-en-us
  k3b
  k3b-i18n
  tuxmath
  education-astronomy
- celestia-gnome
  gpredict
  stellarium
  xplanet
@@ -2715,6 +2696,7 @@ Packages: list
  easychem
  gchempaint
  gdis
+ ghemical
  pymol
  viewmol
  gperiodic
@@ -2756,7 +2738,6 @@ Packages: list
  gnuplot
  kbruch
  kmplot
- mathwar
  rocs
  kig
  geomview
@@ -2768,9 +2749,9 @@ Packages: list
  education-music
  audacity
  terminatorx
+ freebirth
  hydrogen
  denemo
- solfege
  audacious
  lmms
  gtick
@@ -2788,7 +2769,6 @@ Packages: list
  planets
  step
  education-misc
- childsplay
  tuxtype
  tilp2
  pysycache
diff --git a/debian/changelog b/debian/changelog
index 9d8819a..32072d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ debian-edu (1.900) UNRELEASED; urgency=medium
   * Replace squid3 with squid in tasks/main-server (renamed package).
     (Closes: #817138).
   * Replace amarok with successor clementine in desktop-kde.
+  * Remove no longer available package readahead-fedora from tasks/common.
 
  -- Mike Gabriel <sunweaver at debian.org>  Fri, 30 Oct 2015 16:41:35 +0100
 
diff --git a/debian/control b/debian/control
index 1edcb2a..0804371 100644
--- a/debian/control
+++ b/debian/control
@@ -42,14 +42,16 @@ Package: education-astronomy
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: celestia-gnome | celestia-glut | celestia,
- education-menus,
+Recommends: education-menus,
  gpredict,
  kstars,
  stellarium,
  xplanet,
  xplanet-images
-Suggests: sunclock,
+Suggests: celestia,
+ celestia-glut,
+ celestia-gnome,
+ sunclock,
  xtide,
  xtide-data
 Description: Debian Edu astronomy related applications
@@ -65,12 +67,12 @@ Recommends: chemtool,
  education-menus,
  gchempaint,
  gdis,
+ ghemical,
  gperiodic,
  kalzium,
  pymol,
  viewmol
-Suggests: ghemical,
- rasmol
+Suggests: rasmol
 Description: Debian Edu chemistry related applications
  This metapackage depends on various applications that can be used to
  teach chemistry.
@@ -149,7 +151,6 @@ Recommends: apt-listchanges,
  psmisc,
  python-gtk2,
  python-vte,
- readahead-fedora,
  reportbug,
  resolvconf,
  rsync,
@@ -190,6 +191,7 @@ Suggests: apticron | cron-apt,
  nictools-nopci,
  nvram-wakeup,
  popularity-contest,
+ readahead-fedora,
  rsyslog-doc,
  wireshark
 Description: Debian Edu common packages
@@ -204,7 +206,6 @@ Recommends: education-common,
  gdm3,
  gimp,
  gnome,
- gstreamer0.10-pulseaudio,
  inkscape,
  libreoffice-base,
  libreoffice-calc,
@@ -217,7 +218,7 @@ Recommends: education-common,
  libreoffice-writer,
  ssh-askpass-gnome | ssh-askpass,
  synaptic,
- totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer2
+ totem | dragonplayer | vlc | xine-ui
 Suggests: dasher,
  gnochm,
  gnome-accessibility-themes,
@@ -225,8 +226,11 @@ Suggests: dasher,
  gnome-orca,
  gok,
  gstreamer0.10-ffmpeg,
+ gstreamer0.10-pulseaudio,
  iceweasel-gnome-support,
+ kaffeine,
  libreoffice-filter-binfilter,
+ mplayer2,
  x-display-manager
 Description: Debian Edu GNOME desktop applications
  This metapackage depends on various GNOME office and desktop applications
@@ -236,13 +240,12 @@ Package: education-desktop-kde
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: amarok,
- ark,
+Recommends: ark,
  bluedevil,
+ clementine,
  digikam,
- dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer2,
+ dragonplayer | totem | vlc | xine-ui,
  education-common,
- freespacenotifier,
  kaddressbook,
  kamera,
  kcalc,
@@ -268,7 +271,6 @@ Recommends: amarok,
  kdeutils,
  kdewallpapers,
  kdf,
- kdm,
  kfloppy,
  kinfocenter,
  kipi-plugins,
@@ -282,7 +284,6 @@ Recommends: amarok,
  korganizer,
  krdc,
  krfb,
- kscreensaver,
  ksnapshot,
  ksshaskpass | ssh-askpass,
  kturtle,
@@ -290,7 +291,9 @@ Recommends: amarok,
  libreoffice-kde,
  virtuoso-minimal
 Suggests: digikamimageplugins,
+ freespacenotifier,
  kaddressbook-plugins,
+ kaffeine,
  kate-plugins,
  kcron,
  kde,
@@ -301,6 +304,7 @@ Suggests: digikamimageplugins,
  kdenetwork-kfile-plugins,
  kdepim-groupware,
  kdepim-kfile-plugins,
+ kdm,
  kedit,
  kfilereplace,
  kfind,
@@ -315,8 +319,10 @@ Suggests: digikamimageplugins,
  kruler,
  kscd,
  kschoolmenu,
+ kscreensaver,
  kuser,
  kview,
+ mplayer2,
  noatun,
  noatun-plugins,
  printer-applet,
@@ -338,7 +344,6 @@ Recommends: blueman,
  fotoxx,
  galculator,
  gimp,
- gstreamer0.10-pulseaudio,
  inkscape,
  lightdm,
  lxde,
@@ -348,11 +353,14 @@ Recommends: blueman,
  pidgin,
  ssh-askpass,
  synaptic,
- totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer2,
- xchat
+ totem | dragonplayer | vlc | xine-ui
 Suggests: aqualung,
  gstreamer0.10-ffmpeg,
- x-display-manager
+ gstreamer0.10-pulseaudio,
+ kaffeine,
+ mplayer2,
+ x-display-manager,
+ 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.
@@ -375,15 +383,17 @@ Recommends: education-common,
  lightdm,
  mate-desktop-environment,
  mate-desktop-environment-extras,
- mate-media-pulse,
- mate-settings-daemon-pulse,
  ssh-askpass-gnome | ssh-askpass,
  synaptic,
- vlc | xine-ui | kaffeine | mplayer2 | totem | dragonplayer
+ vlc | xine-ui | totem | dragonplayer
 Suggests: dasher,
  gnochm,
  gstreamer0.10-ffmpeg,
+ kaffeine,
  libreoffice-filter-binfilter,
+ mate-media-pulse,
+ mate-settings-daemon-pulse,
+ mplayer2,
  x-display-manager
 Description: Debian Edu MATE desktop applications
  This metapackage depends on various MATE office and desktop applications
@@ -396,7 +406,6 @@ Depends: education-tasks (= ${binary:Version})
 Recommends: alsa-base,
  alsa-utils,
  avahi-daemon,
- browser-plugin-libreoffice,
  bzip2,
  cheese,
  chromium,
@@ -424,23 +433,15 @@ Recommends: alsa-base,
  freerdp-x11 | rdesktop,
  gcj-jre-headless,
  gcompris,
- gecko-mediaplayer,
  gimp,
  gimp-data-extras,
  gimp-ufraw,
- gnome-themes,
  gnucap,
  gnuchess,
  gnupg-agent,
  gnupg2 | gnupg,
  goplay,
  gsfonts-x11,
- gstreamer0.10-alsa,
- gstreamer0.10-fluendo-mp3,
- gstreamer0.10-plugins-base,
- gstreamer0.10-plugins-good,
- gstreamer0.10-plugins-ugly,
- gstreamer0.10-x,
  gtk-recordmydesktop,
  icedtea-7-plugin,
  iceweasel,
@@ -462,6 +463,7 @@ Recommends: alsa-base,
  ktuberling,
  libav-tools,
  libgl1-mesa-dri,
+ libnss-mdns,
  libreoffice,
  libreoffice-help-el,
  libreoffice-help-es,
@@ -480,7 +482,6 @@ Recommends: alsa-base,
  myspell-de-de,
  myspell-el-gr,
  myspell-en-gb,
- myspell-en-us,
  myspell-es,
  myspell-fr,
  myspell-it,
@@ -497,7 +498,6 @@ Recommends: alsa-base,
  sane,
  sane-utils,
  skanlite,
- stopmotion,
  synaptic,
  tmispell-voikko,
  tuxmath,
@@ -518,6 +518,7 @@ Suggests: adept,
  avahi-autoipd,
  avahi-discover,
  browser-plugin-gnash,
+ browser-plugin-libreoffice,
  controlaula,
  dbdesigner,
  dhcp3-client,
@@ -546,12 +547,20 @@ Suggests: adept,
  gcompris-sound-so,
  gcompris-sound-sv,
  gcompris-sound-tr,
+ gecko-mediaplayer,
  gettext,
+ gnome-themes,
  gnupg-doc,
  gnuplot,
+ gstreamer0.10-alsa,
  gstreamer0.10-audiosink,
  gstreamer0.10-esd,
  gstreamer0.10-ffmpeg,
+ gstreamer0.10-fluendo-mp3,
+ gstreamer0.10-plugins-base,
+ gstreamer0.10-plugins-good,
+ gstreamer0.10-plugins-ugly,
+ gstreamer0.10-x,
  gtablix,
  gtk-qt-engine,
  gv,
@@ -671,6 +680,7 @@ Suggests: adept,
  mozilla-plugin-vlc,
  myspell-de-at,
  myspell-de-ch,
+ myspell-en-us,
  myspell-fr-gut,
  mythes-en-us,
  ncftp,
@@ -687,6 +697,7 @@ Suggests: adept,
  scim-tables-zh,
  smbclient,
  sql-ledger,
+ stopmotion,
  tablix2,
  texlive,
  texlive-doc-base,
@@ -724,7 +735,6 @@ Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
 Recommends: autoconf,
- bluefish,
  build-essential,
  bwbasic,
  ddd,
@@ -754,7 +764,8 @@ Recommends: autoconf,
  squeak-vm,
  subversion,
  umbrello
-Suggests: eclipse,
+Suggests: bluefish,
+ eclipse,
  fp-units-i386,
  gambas2,
  quanta,
@@ -913,7 +924,7 @@ Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
 Recommends: apache2,
- atftpd | tftpd-hpa,
+ avahi-daemon,
  bind9 | pdns-backend-ldap,
  debian-installer-8-netboot-amd64,
  debian-installer-8-netboot-i386,
@@ -943,7 +954,7 @@ Recommends: apache2,
  krb5-kdc,
  krb5-kdc-ldap,
  ldap2zone | pdns-recursor,
- libapache2-mod-auth-kerb,
+ libnss-mdns,
  libsasl2-modules-gssapi-mit,
  links,
  makepasswd,
@@ -964,10 +975,14 @@ Recommends: apache2,
  slbackup-php,
  smbclient,
  smbldap-tools,
- squid3,
+ squid,
  syslinux-common,
- tdb-tools
+ tdb-tools,
+ tftpd-hpa
 Suggests: apache2-doc,
+ atftpd,
+ avahi-autoipd,
+ avahi-discover,
  calamaris,
  debian-edu-fr-all,
  debian-edu-fr-skels,
@@ -977,8 +992,11 @@ Suggests: apache2-doc,
  dnswalk,
  dovecot-pop3d,
  dsh,
+ kdnssd,
  krb5-doc,
+ libapache2-mod-auth-kerb,
  libsasl2-modules-ldap,
+ mdns-scan,
  mysql-client,
  nagios3-doc,
  nfs-server,
@@ -1007,7 +1025,6 @@ Recommends: education-menus,
  kbruch,
  kig,
  kmplot,
- mathwar,
  rocs,
  xabacus
 Suggests: abakus,
@@ -1023,6 +1040,7 @@ Suggests: abakus,
  kseg,
  lybniz,
  mathomatic,
+ mathwar,
  octave,
  pari-gp,
  qliss3d,
@@ -1040,9 +1058,7 @@ Package: education-misc
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: childsplay,
- education-menus,
- freemind,
+Recommends: education-menus,
  gcompris,
  pysycache,
  scratch,
@@ -1050,7 +1066,9 @@ Recommends: childsplay,
  tuxpaint,
  tuxtype
 Suggests: blinken,
+ childsplay,
  flashplugin-nonfree,
+ freemind,
  freeplane,
  ggradebook,
  jclic,
@@ -1071,6 +1089,7 @@ Recommends: audacious,
  education-menus,
  fluid-soundfont-gm,
  fluidsynth,
+ freebirth,
  gtick,
  hydrogen,
  jackd,
@@ -1081,17 +1100,16 @@ Recommends: audacious,
  qjackctl,
  qsynth,
  rosegarden,
- solfege,
  swh-plugins,
  terminatorx
 Suggests: beast,
  festival,
- freebirth,
  kguitar,
  lenmus,
  lilypond,
  noteedit,
  score-reading-trainer,
+ solfege,
  ultrastar-ng-xine
 Description: Debian Edu music and sound applications
  This metapackage depends on various applications that can be used to
@@ -1149,8 +1167,9 @@ Depends: education-tasks (= ${binary:Version})
 Recommends: education-common,
  education-desktop-other,
  libnss-mdns,
- plasma-widget-networkmanagement | network-manager-gnome,
+ network-manager-gnome,
  sudo
+Suggests: plasma-widget-networkmanagement
 Description: Debian Edu standalone workstation packages
  A metapackage containing dependencies for packages required on all
  small standalone workstation installations in the Debian Edu Blend.
@@ -1175,9 +1194,7 @@ Package: education-thin-client-server
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${binary:Version})
-Recommends: atftpd | tftpd-hpa,
- education-workstation,
- gstreamer0.10-pulseaudio,
+Recommends: education-workstation,
  iptables,
  isc-dhcp-server-ldap,
  ltsp-server-standalone,
@@ -1190,9 +1207,12 @@ Recommends: atftpd | tftpd-hpa,
  pulseaudio-utils,
  rdiff-backup,
  tftp-hpa,
+ tftpd-hpa,
  tightvncserver,
  xrdp
-Suggests: italc-client,
+Suggests: atftpd,
+ gstreamer0.10-pulseaudio,
+ italc-client,
  italc-master,
  libpulse-mainloop-glib0,
  ltsp-controlaula
diff --git a/tasks/common b/tasks/common
index 7d5b97b..5710820 100644
--- a/tasks/common
+++ b/tasks/common
@@ -296,11 +296,6 @@ Why:         Non-free driver firmware have been split out into separate
 Responsible: Petter Reinholdtsen
 NeedConfig:  No
 
-Recommends:  readahead-fedora
-Why:         Speed and clean up the boot.
-Responsible: Petter Reinholdtsen
-NeedConfig:  Yes
-
 Depends:     cups, foomatic-db, foomatic-db-engine, foomatic-db-gutenprint, \
              cups-filters (>= 1.0.42-1) | foomatic-filters (<= 4.0.17-1) | cupsomatic-ppd, \
              cups-browsed, printer-driver-pnm2ppa, \

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



More information about the debian-edu-commits mailing list