Removing tucan from wheezy onwards

diff --git a/manifests/subsystems/utils/multimedia.pp b/manifests/subsystems/utils/multimedia.pp
index 2b0980843810a2ad1f0a8dfd58881dee8de3f619..246de7684f7a8d6aa2f373fe4d2932d06cc6a07f 100644 (file)
--- a/manifests/subsystems/utils/multimedia.pp
+++ b/manifests/subsystems/utils/multimedia.pp
@@ -22,12 +22,20 @@ class utils::multimedia {
               'easytag',         'flashplugin-nonfree', 'vlc',             'audacity',
               'opencubicplayer', 'moc',                 'cmus',            'orpheus',
               'cbrpager',        'llgal',               'darksnow',        'mplayer',
-              'tucan',           'ffmpeg2theora',       'oggfwd',          'libasound2-plugins',
-              'mencoder',        'v4l-utils',           'gstreamer-tools', 'youtube-dl',
-              'picard' ]:
+              'picard',          'ffmpeg2theora',       'oggfwd',          'libasound2-plugins',
+              'mencoder',        'v4l-utils',           'gstreamer-tools', 'youtube-dl' ]:
     ensure => installed,
   }
 
+  # Squeeze only
+  package { 'tucan':
+    ensure => $::lsbdistcodename ? {
+      'squeeze' => installed,
+      default   => absent,
+    }
+  }
+
+  # Wheezy onwards
   package { 'landell':
     ensure => $::lsbdistcodename ? {
       'squeeze' => absent,