Updates utils

diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index 7bda1c50c9613fea18bec1a36b1100081398e00e..e5aac1bca9380634754e4888325d6115fa553268 100644 (file)
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,7 +1,7 @@
 class nodo::utils::development::puppet {
   package { [
     'puppet-lint',
-    'ruby-hiera-puppet',
+    'hiera-eyaml',
   ]:
     ensure => installed,
   }

diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index e4b23b5397249af16485a3cc4fc0d4379d2c105f..23a8a66d1700aa40a68171109a8e66309ffc7cde 100644 (file)
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -8,6 +8,7 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
     'cbrpager',
     'pavucontrol',
     'jhead',
+    'xine-ui',
     #'alsa-tools-gui',
     #'v4l-utils',
     #'gstreamer-tools',
@@ -19,7 +20,6 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
     #'darksnow',
     #'ffmpeg2theora',
     #'netpbm',
-    #'xine-ui',
     #'audacious',
     #'qjackctl',
     #'easytag',

diff --git a/manifests/utils/multimedia/minimal.pp b/manifests/utils/multimedia/minimal.pp
index d7795249550bbfad6e8bd926b66c446bf74c1055..3459daa28d7b98054506799883a3529654433b74 100644 (file)
--- a/manifests/utils/multimedia/minimal.pp
+++ b/manifests/utils/multimedia/minimal.pp
@@ -3,17 +3,8 @@ class nodo::utils::multimedia::minimal {
     'alsa-utils',
     'mpg123',
     'mediainfo',
+    'mplayer2',
   ]:
     ensure => installed,
   }
-
-  package { [
-    'mplayer',
-  ]:
-    ensure  => present,
-    name    => $::lsbdistcodename ? {
-      'wheezy' => 'mplayer',
-      default  => 'mplayer2',
-    },
-  }
 }

diff --git a/manifests/utils/personal.pp b/manifests/utils/personal.pp
index 520221627640a620bed43e0c45039bea43467009..83fa7bc8863982427e0dba2cce39275c5d1b3d50 100644 (file)
--- a/manifests/utils/personal.pp
+++ b/manifests/utils/personal.pp
@@ -1,8 +1,8 @@
-# Common utilities for personal
+# Common utilities for personal computers
 class nodo::utils::personal {
   case $::operatingsystem {
     debian: { 
-      include nodo::utils::personal::debian
+      include nodo::utils::bundle::debian
     }
     default: { }
   }