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

[pere at alioth.debian.org]

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

Modified:
   branches/wheezy/debian-edu/debian/changelog
   branches/wheezy/debian-edu/tasks/desktop-other
Log:
Prefer browser-plugin-gnash over mozilla-plugin-gnash in the
desktop-other task, to use the new package name in Wheezy.  Ignore
browser-plugin-lightspark in the same task to put it on our watch
list.

Modified: branches/wheezy/debian-edu/debian/changelog
===================================================================
--- branches/wheezy/debian-edu/debian/changelog	2013-04-25 07:50:51 UTC (rev 79778)
+++ branches/wheezy/debian-edu/debian/changelog	2013-04-25 07:53:09 UTC (rev 79779)
@@ -18,6 +18,10 @@
     development task, for HTML and python development.
   * Ignore escputil in the common task to put it on our watch list.
     It is a tool useful for Epson printer owners.
+  * Prefer browser-plugin-gnash over mozilla-plugin-gnash in the
+    desktop-other task, to use the new package name in Wheezy.  Ignore
+    browser-plugin-lightspark in the same task to put it on our watch
+    list.
 
  -- 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:50:51 UTC (rev 79778)
+++ branches/wheezy/debian-edu/tasks/desktop-other	2013-04-25 07:53:09 UTC (rev 79779)
@@ -227,12 +227,12 @@
 Responsible: ?
 NeedConfig:  ?
 
-Depends:     konqueror-plugin-gnash, mozilla-plugin-gnash
+Depends:     konqueror-plugin-gnash, browser-plugin-gnash | mozilla-plugin-gnash
 Recommends:  gstreamer0.10-plugins-base, gstreamer0.10-alsa, \
              gstreamer0.10-fluendo-mp3, \
              gstreamer0.10-ffmpeg, gstreamer0.10-audiosink
 Suggests:    flashplugin-nonfree, flashplugin-nonfree-pulse | libflashsupport
-
+Ignore:      browser-plugin-lightspark
 Avoid:       flashplugin-nonfree
 Why:         Several web pages uses Macromedia Flash.  Recommend the
              packages gnash need to play youtube videos.  The depends