Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-05-29 15:51:19 (GMT)
committer Daniel Drake <dsd@laptop.org>2012-05-29 15:51:19 (GMT)
commit225538d48a266af077e6d11ef1757aa1e2e18b49 (patch)
tree4a16a4ddf24698d7f963ae6be28bac91963e6203
parentd124d9a3247152124c701247e52ee2bd1315611c (diff)
adobe_flash: remove gnash-plugin
If Adobe flash is being installed, remove gnash. gnash is assumed redundant in such cases and can sometimes take precedence over flash.
-rw-r--r--modules/adobe_flash/kspkglist.50.adobeflash.inc2
-rw-r--r--modules/adobe_flash/kspkglist.60.adobeflash.inc4
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/adobe_flash/kspkglist.50.adobeflash.inc b/modules/adobe_flash/kspkglist.50.adobeflash.inc
deleted file mode 100644
index 739a7c1..0000000
--- a/modules/adobe_flash/kspkglist.50.adobeflash.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-flash-plugin
-
diff --git a/modules/adobe_flash/kspkglist.60.adobeflash.inc b/modules/adobe_flash/kspkglist.60.adobeflash.inc
new file mode 100644
index 0000000..7c5b200
--- /dev/null
+++ b/modules/adobe_flash/kspkglist.60.adobeflash.inc
@@ -0,0 +1,4 @@
+# Must be run after any modules that install gnash-plugin (gnome, sugar)
+-gnash-plugin
+
+flash-plugin