[debian-edu-commits] debian-edu/ 01/01: Remove obsolete openjdk-6-jre and icedtea-6-plugin from tasks/desktop-other. Depend only on default-jre and icedtea-7-plugin instead.

[Petter Reinholdtsen]

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

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

commit 498ff950626ec9223d47434da9b4b2565fe7e40b
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Aug 14 15:30:18 2014 +0200

    Remove obsolete openjdk-6-jre and icedtea-6-plugin from tasks/desktop-other. Depend only on default-jre and icedtea-7-plugin instead.
---
 debian/changelog    | 2 ++
 tasks/desktop-other | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8b6ba11..b700dc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debian-edu (1.721~0.git.2014-08-13) unstable; urgency=low
 
   * Rename ffmpeg to libav-tools in tasks/desktop-other, to match the new
     name of the binary package (Closes: #722289).
+  * Remove obsolete openjdk-6-jre and icedtea-6-plugin from tasks/desktop-other.
+    Depend only on default-jre and icedtea-7-plugin instead.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 13 Aug 2014 23:13:12 +0200
 
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 9672e83..179b17c 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -253,7 +253,7 @@ Why:         Several web pages uses Macromedia Flash.  Recommend the
 Responsible: Petter Reinholdtsen
 NeedConfig:  no
 
-Recommends:  default-jre | openjdk-6-jre, icedtea-6-plugin | icedtea6-plugin
+Recommends:  default-jre, icedtea-7-plugin
 Ignore:      sun-java6-jre, sun-java6-plugin
 Why:         We need a Java run-time environment, but possibly no
              development tools in the standard installation.  Info om

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