[debian-edu-commits] debian-edu/ 02/02: Update after running 'make dist', now that #853885 has been closed and the related commit to work around the bug has been reverted.

[Wolfgang Schweer]

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 9e331f4fa68adf9def8f39833e09a9cd8c83a5f1
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Mar 8 20:44:39 2017 +0100

    Update after running 'make dist', now that #853885 has been closed and the
    related commit to work around the bug has been reverted.
---
 debian-edu-tasks.desc |  8 +-------
 debian/control        | 12 +++++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 19a5847..001f9ad 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -510,7 +510,6 @@ Packages: list
  fonts-linex
  synaptic
  alsa-utils
- alsa-base
  gcj-jre-headless
  libreoffice
  konqueror-plugin-gnash
@@ -1356,7 +1355,6 @@ Packages: list
  fonts-linex
  synaptic
  alsa-utils
- alsa-base
  gcj-jre-headless
  libreoffice
  konqueror-plugin-gnash
@@ -1549,7 +1547,6 @@ Packages: list
  goplay
  krb5-auth-dialog
  jxplorer
- openbox
  pulseaudio
  pulseaudio-esound-compat
  pulseaudio-utils
@@ -2096,7 +2093,6 @@ Packages: list
  fonts-linex
  synaptic
  alsa-utils
- alsa-base
  gcj-jre-headless
  libreoffice
  konqueror-plugin-gnash
@@ -2402,7 +2398,6 @@ Packages: list
  fonts-linex
  synaptic
  alsa-utils
- alsa-base
  gcj-jre-headless
  libreoffice
  konqueror-plugin-gnash
@@ -2610,8 +2605,8 @@ Packages: list
  debian-edu-artwork
  sitesummary-client
  alsa-utils
- alsa-base
  acpi-support-base
+ alsa-base
 
 Task: education-workstation
 Section: debian-edu
@@ -2747,7 +2742,6 @@ Packages: list
  fonts-linex
  synaptic
  alsa-utils
- alsa-base
  gcj-jre-headless
  libreoffice
  konqueror-plugin-gnash
diff --git a/debian/control b/debian/control
index 78c066f..d821f7c 100644
--- a/debian/control
+++ b/debian/control
@@ -370,8 +370,7 @@ Package: education-desktop-other
 Section: metapackages
 Architecture: any
 Depends: education-tasks (= ${source:Version}), ${misc:Depends}
-Recommends: alsa-base,
- alsa-utils,
+Recommends: alsa-utils,
  avahi-daemon,
  browser-plugin-gnash | mozilla-plugin-gnash,
  bzip2,
@@ -481,7 +480,8 @@ Recommends: alsa-base,
  xserver-xorg-input-all,
  xserver-xorg-video-all,
  zip
-Suggests: auctex,
+Suggests: alsa-base,
+ auctex,
  avahi-autoipd,
  avahi-discover,
  browser-plugin-libreoffice,
@@ -1106,7 +1106,6 @@ Recommends: atftpd | tftpd-hpa,
  nagios-nrpe-server,
  nagios-plugins-standard,
  nbd-server,
- openbox,
  pulseaudio,
  pulseaudio-esound-compat,
  pulseaudio-utils,
@@ -1119,8 +1118,7 @@ Suggests: gstreamer0.10-pulseaudio,
  italc-client,
  italc-master,
  libpulse-mainloop-glib0,
- ltsp-controlaula,
- x-session-manager
+ ltsp-controlaula
 Description: Debian Edu networked LTSP server packages
  A metapackage containing dependencies for packages required on all
  networked LTSP server installations in the Debian Edu Blend.
@@ -1430,12 +1428,12 @@ Section: metapackages
 Architecture: amd64 i386 powerpc
 Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: acpi-support-base,
- alsa-base,
  alsa-utils,
  debian-edu-artwork,
  iputils-ping,
  ltsp-client,
  sitesummary-client
+Suggests: alsa-base
 Description: Debian Edu networked thin client packages
  This metapackage depends on various packages required on all
  networked thin client 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