summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control9
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index 98ff351..54375c7 100644
--- a/debian/control
+++ b/debian/control
@@ -281,8 +281,9 @@ Depends:
Recommends:
flashplayer-chromium,
flashplayer-mozilla,
- browser-plugin-freshplayer-pepperflash,
Conflicts:
+ browser-plugin-gnash,
+ browser-plugin-freshplayer-pepperflash,
debian-edu-artwork-joy,
flashplugin-nonfree,
gdm,
@@ -875,8 +876,9 @@ Depends:
Recommends:
flashplayer-chromium,
flashplayer-mozilla,
-browser-plugin-freshplayer-pepperflash,
Conflicts:
+ browser-plugin-gnash,
+ browser-plugin-freshplayer-pepperflash,
debian-edu-artwork-joy,
flashplugin-nonfree,
gdm,
@@ -1180,9 +1182,10 @@ Depends:
Recommends:
flashplayer-chromium,
flashplayer-mozilla,
- browser-plugin-freshplayer-pepperflash,
network-manager-gnome,
Conflicts:
+ browser-plugin-gnash,
+ browser-plugin-freshplayer-pepperflash,
debian-edu-artwork-joy,
flashplugin-nonfree,
gdm,