Updating packages

1 files changed, 8 insertions, 10 deletions

diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index 7f2daa3..a61c2bf 100644
--- a/manifests/subsystems/utils/multimedia.pp
+++ b/manifests/subsystems/utils/multimedia.pp
@@ -7,8 +7,8 @@ class utils::multimedia::studio {
     }
   }
 
-  # CD extractors
-  package { [ 'ripit', 'asunder' ]:
+  # CD writers and extractors
+  package { [ 'ripit', 'asunder', 'wodim', 'genisoimage', 'dvd+rw-tools' ]:
     ensure => installed,
   }
 }
@@ -17,26 +17,24 @@ class utils::multimedia {
   # Multimedia
   package { [ 'alsa-tools-gui',  'mp3blaster',          'alsa-utils',      'netpbm',
               'gqview',          'mpg123',              'audacious',       'qjackctl',
-              'gimp',            'xine-ui',             'amarok',          'wodim',
-              'genisoimage',     'dvd+rw-tools',        'inkscape',        'jhead',
+              'gimp',            'xine-ui',             'v4l-utils',       'inkscape',
               'easytag',         'gstreamer-tools',     'vlc',             'audacity',
-              'opencubicplayer', 'moc',                 'cmus',            'youtube-dl',
+              'opencubicplayer', 'youtube-dl',          'mencoder',        'libasound2-plugins'
               'cbrpager',        'llgal',               'darksnow',        'mplayer',
-              'picard',          'ffmpeg2theora',       'oggfwd',          'libasound2-plugins',
-              'mencoder',        'v4l-utils' ]:
+              'picard',          'ffmpeg2theora',       'oggfwd',          'jhead' ]:
     ensure => installed,
   }
 
   # Old stuff
-  package { 'flashplugin-nonfree':
-    ensure => absent,
+  package { [ 'flashplugin-nonfree', 'amarok', 'moc', 'cmus' ]:
+    ensure => purged,
   }
 
   # Squeeze only
   package { [ 'tucan', 'orpheus' ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => installed,
-      default   => absent,
+      default   => purged,
     }
   }