[debian-edu-commits] debian-edu/ 03/06: updated after 'make dist'

[Holger Levsen]

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

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

commit 49bd8550be19d3aab009b7462375f0074d0baedb
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Sep 15 16:31:02 2017 +0200

    updated after 'make dist'
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian-edu-tasks.desc | 2 --
 debian/control        | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index efdac92..e59e780 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -2401,7 +2401,6 @@ Packages: list
  goplay
  standardskriver
  network-manager-gnome
- plasma-nm
  libpam-mklocaluser
  libpam-sss
  libnss-sss
@@ -2757,7 +2756,6 @@ Packages: list
  goplay
  standardskriver
  sudo
- plasma-nm
  network-manager-gnome
 
 Task: education-thin-client
diff --git a/debian/control b/debian/control
index 83d7bdf..aea443a 100644
--- a/debian/control
+++ b/debian/control
@@ -1366,8 +1366,7 @@ Depends: ${misc:Depends},
  libnss-sss,
  libpam-mklocaluser,
  libpam-sss,
- network-manager-gnome,
- plasma-nm
+ network-manager-gnome | plasma-nm | cmst | wicd
 Recommends: krb5-auth-dialog
 Description: Debian Edu networked roaming workstation packages
  A metapackage containing dependencies for packages required on all
@@ -1382,8 +1381,7 @@ Depends: ${misc:Depends},
  education-desktop-other,
  education-tasks (= ${source:Version}),
  libnss-mdns,
- network-manager-gnome,
- plasma-nm,
+ network-manager-gnome | plasma-nm | cmst | wicd,
  sudo
 Description: Debian Edu standalone workstation packages
  A metapackage containing dependencies for packages required on all

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