aboutsummaryrefslogtreecommitdiff
path: root/manifests/utils/multimedia.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-25 19:12:57 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-25 19:12:57 -0300
commita3c60b8a5d1caeb6e8f8a6828bdb2ea7b0ff2759 (patch)
treef297402c48e87197b3aaad1fe4c72a9c19e5c5dd /manifests/utils/multimedia.pp
parent656c7285635b365fd17944a1e5a82887c2aec26a (diff)
downloadpuppet-nodo-a3c60b8a5d1caeb6e8f8a6828bdb2ea7b0ff2759.tar.gz
puppet-nodo-a3c60b8a5d1caeb6e8f8a6828bdb2ea7b0ff2759.tar.bz2
Wheezy-only packages
Diffstat (limited to 'manifests/utils/multimedia.pp')
-rw-r--r--manifests/utils/multimedia.pp17
1 files changed, 9 insertions, 8 deletions
diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index 12f537d..a61a88f 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -2,10 +2,10 @@
class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
# Multimedia
package { [ 'alsa-tools-gui', 'mp3blaster', 'netpbm',
- 'gqview', 'audacious', 'qjackctl',
+ 'audacious', 'qjackctl',
'gimp', 'xine-ui', 'v4l-utils', 'inkscape',
'easytag', 'gstreamer-tools', 'vlc', 'audacity',
- 'opencubicplayer', 'mencoder', 'libasound2-plugins', 'lame',
+ 'opencubicplayer', 'libasound2-plugins', 'lame',
'cbrpager', 'llgal', 'darksnow', 'pavucontrol',
'picard', 'ffmpeg2theora', 'oggfwd', 'jhead',
'gxine', 'totem', 'faad', 'gmtp',
@@ -26,15 +26,16 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
}
}
- # Wheezy onwards
- package { 'landell':
+ # Wheezy only
+ package { [ 'landell', 'gqview', 'mencoder' ]:
ensure => $::lsbdistcodename ? {
'squeeze' => absent,
- default => installed,
+ 'wheezy' => installed,
+ default => absent,
}
}
- # Flash implementation
- $flash = hiera('nodo::utils::multimedia::flash', 'gnash')
- class { "nodo::utils::multimedia::${flash}": }
+ # Flash implementation (deprecated)
+ #$flash = hiera('nodo::utils::multimedia::flash', 'gnash')
+ #class { "nodo::utils::multimedia::${flash}": }
}