Updating packages

diff --git a/manifests/subsystems/utils/interface.pp b/manifests/subsystems/utils/interface.pp
index e5f2045dc0552ddf91f42530c6dca18aaf17a8b0..e1a5ddd4f434ecef2eea7bb0d75c00e3466eb6a3 100644 (file)
--- a/manifests/subsystems/utils/interface.pp
+++ b/manifests/subsystems/utils/interface.pp
@@ -1,15 +1,14 @@
 class utils::interface {
   # Interface
-  package { [ 'awesome',       'eterm',            'fluxbox',           'gnome-terminal', 'conky',
+  package { [ 'awesome',       'eterm',            'weather-util',      'gnome-terminal', 'conky',
               'xterm',         'bash-completion',  'tmux',              'xscreensaver',   'thunar',
               'mc',            'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt',           'lxappearance',
-              'xtitle',        'xclip',            'pcmanfm',           'awesome-extra',  'numlockx',
-              'weather-util' ]:
+              'xtitle',        'xclip',            'pcmanfm',           'awesome-extra',  'numlockx' ]:
     ensure => installed,
   }
 
   # Old stuff
-  package { 'conkyforecast':
+  package { [ 'conkyforecast', 'fluxbox' ]:
     ensure => absent,
   }
 

diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp
index c6a6bd1d12ba6af396ebc83c96f9d2804400dfa5..12ee1c8ed20f29f49b3d88da429c7f56ccaf1d85 100644 (file)
--- a/manifests/subsystems/utils/laptop.pp
+++ b/manifests/subsystems/utils/laptop.pp
@@ -11,13 +11,13 @@ class utils::laptop {
 # Common utilities for debian laptops
 class utils::laptop::debian {
   package { [ 'cpufrequtils',  'module-assistant',  'wireless-tools', 
-              'wpasupplicant', 'ekiga',             'gnome',
+              'wpasupplicant', 'ekiga',             'mumble',
               'revelation',    'arp-scan',          'usb-modeswitch',
               'iw',            'wvdial',            'wavemon',
               'btscanner',     'laptop-mode-tools', 'acpi-support',
               'tftp',          'sharutils',         'wireshark',
               'macchanger',    'weplab',            'wpagui',
-              'gnokii',        'mumble' ]:
+              'gnokii' ]:
     ensure => installed,
   }
 

diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index 7f2daa3b8711fbaf4f62783c4bac004038aac2f9..a61c2bf5c242feed81a91d8a7ca29e2f8a8baac7 100644 (file)
--- 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,
     }
   }