[debian-edu-commits] debian-edu/ 01/01: tasks/desktop-(gnome|kde|mate|lxde): change depends on mplayer2 with ones on mplayer. Thanks James Cowgill for notifying us! (Closes: #841184)

[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 f245ba7d7317b1424fc6d78e8c0eac20b9ddfb1d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 18 13:54:48 2016 +0200

    tasks/desktop-(gnome|kde|mate|lxde): change depends on mplayer2 with ones on mplayer. Thanks James Cowgill for notifying us! (Closes: #841184)
---
 debian/changelog    | 7 +++++++
 debian/control      | 8 ++++----
 tasks/desktop-gnome | 2 +-
 tasks/desktop-kde   | 2 +-
 tasks/desktop-lxde  | 2 +-
 tasks/desktop-mate  | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4fe951c..7a012ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu (1.911) UNRELEASED; urgency=medium
+
+  * tasks/desktop-(gnome|kde|mate|lxde): change depends on mplayer2 with
+    ones on mplayer. Thanks James Cowgill for notifying us! (Closes: #841184)
+
+ -- Holger Levsen <holger at debian.org>  Tue, 18 Oct 2016 13:52:41 +0200
+
 debian-edu (1.910) unstable; urgency=medium
 
   * tasks/main-server: suggest default-mysql-client instead of obsolete
diff --git a/debian/control b/debian/control
index ef1073c..c4658df 100644
--- a/debian/control
+++ b/debian/control
@@ -211,7 +211,7 @@ Recommends: education-common,
  libreoffice-writer,
  ssh-askpass-gnome | ssh-askpass,
  synaptic,
- totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer2
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 Suggests: dasher,
  gnome-accessibility-themes,
  gnome-mag,
@@ -233,7 +233,7 @@ Recommends: ark,
  bluedevil,
  clementine,
  digikam,
- dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer2,
+ dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer,
  education-common,
  kaddressbook,
  kamera,
@@ -313,7 +313,7 @@ Recommends: blueman,
  pidgin,
  ssh-askpass,
  synaptic,
- totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer2
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 Suggests: aqualung,
  gstreamer0.10-ffmpeg,
  gstreamer0.10-pulseaudio,
@@ -343,7 +343,7 @@ Recommends: education-common,
  mate-desktop-environment-extras,
  ssh-askpass-gnome | ssh-askpass,
  synaptic,
- vlc | xine-ui | kaffeine | mplayer2 | totem | dragonplayer
+ vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer
 Suggests: dasher,
  gstreamer0.10-ffmpeg,
  libreoffice-filter-binfilter,
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index dbddb11..a033d50 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -31,7 +31,7 @@ Why:          Use Libreoffice as the default office suite for Gnome
 Responsible:    José L. Redrejo Rodríguez
 NeedConfig:     No
 
-Depends:     totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer2
+Depends:     totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 Why:         Prefered video / multimedia player for the Gnome environment.
 Responsible: Mike Gabriel
 NeedConfig:  no
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index c96eaaa..ef2c5ab 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -42,7 +42,7 @@ Why:         The KDE desktop environment does not pull in a display manager.
              because gdm3 pulls in Gnome.
 NeedConfig:  yes, artwork
 
-Depends:     dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer2
+Depends:     dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer
 Why:         Prefered video / multimedia player for the KDE environment.
 Responsible: ?
 NeedConfig:  ?
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index 1a96686..7c19a56 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -32,7 +32,7 @@ Why:          The LXDE desktop environment pull in the lightdm display
               it pull in Gnome when installed.
 NeedConfig:   yes, artwork
 
-Depends:     totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer2
+Depends:     totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer
 Why:         Prefered video / multimedia player for the LXDE environment.
 Responsible: Mike Gabriel
 NeedConfig:  no
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index 0a8b4d2..3501667 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -31,7 +31,7 @@ Why:          Use Libreoffice as the default office suite for MATE
 Responsible:    Mike Gabriel
 NeedConfig:     No
 
-Depends:     vlc | xine-ui | kaffeine | mplayer2 | totem | dragonplayer
+Depends:     vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer
 Why:         Prefered video / multimedia player for the MATE environment.
 Responsible: Mike Gabriel
 NeedConfig:  no

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