[debian-edu-commits] r79773 - in branches/wheezy/debian-edu: debian tasks

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-25 07:19:53 +0000 (Thu, 25 Apr 2013)
New Revision: 79773

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/desktop-other
Log:
List icedtea-6-plugin as the prefered package over icedtea6-plugin, to match the proper package name in Wheezy.

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-04-25 07:16:26 UTC (rev 79772)
+++ branches/wheezy/debian-edu/debian/changelog	2013-04-25 07:19:53 UTC (rev 79773)
@@ -9,6 +9,8 @@
   * Promote freemind from Ignore to Recommends in desktop-other, as it
     was suggested as a application to install by default by Nigel
     Barker.
+  * List icedtea-6-plugin as the prefered package over icedtea6-plugin,
+    to match the proper package name in Wheezy.
 
  -- Holger Levsen <holger at debian.org>  Wed, 24 Apr 2013 00:43:44 +0200
 

Modified: branches/wheezy/debian-edu/tasks/desktop-other
===================================================================
--- branches/wheezy/debian-edu/tasks/desktop-other	2013-04-25 07:16:26 UTC (rev 79772)
+++ branches/wheezy/debian-edu/tasks/desktop-other	2013-04-25 07:19:53 UTC (rev 79773)
@@ -243,7 +243,7 @@
 Responsible: Petter Reinholdtsen
 NeedConfig:  no
 
-Recommends:  default-jre | openjdk-6-jre, icedtea6-plugin
+Recommends:  default-jre | openjdk-6-jre, icedtea-6-plugin | icedtea6-plugin
 Ignore:      sun-java6-jre, sun-java6-plugin
 Avoid:       ibm-jdk1.1-installer, jdk1.1, kaffe
 Why:         We need a Java run-time environment, but possibly no