aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystems/utils/multimedia.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/subsystems/utils/multimedia.pp')
-rw-r--r--manifests/subsystems/utils/multimedia.pp13
1 files changed, 9 insertions, 4 deletions
diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index 246de76..03675ef 100644
--- a/manifests/subsystems/utils/multimedia.pp
+++ b/manifests/subsystems/utils/multimedia.pp
@@ -19,16 +19,21 @@ class utils::multimedia {
'gqview', 'mpg123', 'audacious', 'qjackctl',
'gimp', 'xine-ui', 'amarok', 'wodim',
'genisoimage', 'dvd+rw-tools', 'inkscape', 'jhead',
- 'easytag', 'flashplugin-nonfree', 'vlc', 'audacity',
- 'opencubicplayer', 'moc', 'cmus', 'orpheus',
+ 'easytag', 'gstreamer-tools', 'vlc', 'audacity',
+ 'opencubicplayer', 'moc', 'cmus', 'youtube-dl',
'cbrpager', 'llgal', 'darksnow', 'mplayer',
'picard', 'ffmpeg2theora', 'oggfwd', 'libasound2-plugins',
- 'mencoder', 'v4l-utils', 'gstreamer-tools', 'youtube-dl' ]:
+ 'mencoder', 'v4l-utils' ]:
ensure => installed,
}
+ # Old stuff
+ package { 'flashplugin-nonfree',
+ ensure => absent,
+ }
+
# Squeeze only
- package { 'tucan':
+ package { [ 'tucan', 'orpheus' ]:
ensure => $::lsbdistcodename ? {
'squeeze' => installed,
default => absent,