diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 19:15:37 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-25 19:15:37 -0300 |
| commit | eab48bc8d50da549cd4be07d7ede5b25cd876c42 (patch) | |
| tree | b4b9a7416e03d9a2660cb4ab7f13eaa126e2aa4f /manifests/utils/multimedia.pp | |
| parent | 8565e440c848b2987f7784cf153fb7a4620b1fab (diff) | |
| parent | a3c60b8a5d1caeb6e8f8a6828bdb2ea7b0ff2759 (diff) | |
| download | puppet-nodo-eab48bc8d50da549cd4be07d7ede5b25cd876c42.tar.gz puppet-nodo-eab48bc8d50da549cd4be07d7ede5b25cd876c42.tar.bz2 | |
Merge branch 'master' into develop
Diffstat (limited to 'manifests/utils/multimedia.pp')
| -rw-r--r-- | manifests/utils/multimedia.pp | 17 |
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}": } } |