[debian-edu-commits] debian-edu/ 19/31: tasks/{standalone, roaming-workstation}: Ideally both network-manager applets are available (plasma-nm, network-manager-gome). As we don't know the desktop-environment, let's pull in both.

[Mike Gabriel]

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

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

commit dcbe745ce151205ee7d6a6340b2f02b1ac516f32
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 13 22:59:40 2017 -0400

    tasks/{standalone,roaming-workstation}: Ideally both network-manager applets are available (plasma-nm, network-manager-gome). As we don't know the desktop-environment, let's pull in both.
---
 debian/changelog          | 3 +++
 tasks/roaming-workstation | 3 ++-
 tasks/standalone          | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ac3890..13c0413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,9 @@ debian-edu (1.925) UNRELEASED; urgency=medium
   * tasks/services: Drop services task. It only recommended dansguardian, which
     is dead upstream. We should have a filter-server task, instead.
   * tasks/misc: De-promote all to Recommends:.
+  * tasks/{standalone,roaming-workstation}: Ideally both network-manager
+    applets are available (plasma-nm, network-manager-gome). As we don't
+    know the desktop-environment, let's pull in both.
 
   [ Holger Levsen ]
   * Add sources.list.buster and make sources.list.UNRELEASED symlink point to
diff --git a/tasks/roaming-workstation b/tasks/roaming-workstation
index 6fe0bdc..8aac3eb 100644
--- a/tasks/roaming-workstation
+++ b/tasks/roaming-workstation
@@ -14,7 +14,8 @@ Depends:
  education-desktop-other,
 
 Depends:
- network-manager-gnome | plasma-widget-networkmanagement
+ network-manager-gnome,
+ plasma-nm,
 
 Depends:
  libnss-mdns,
diff --git a/tasks/standalone b/tasks/standalone
index b66d09f..44f0a94 100644
--- a/tasks/standalone
+++ b/tasks/standalone
@@ -16,7 +16,8 @@ Depends:
  sudo,
 
 Depends:
- plasma-nm | network-manager-gnome,
+ plasma-nm,
+ network-manager-gnome,
 
 Depends:
  libnss-mdns,

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