Adding and sorting office/multimedia packages

diff --git a/manifests/utils/laptop/debian.pp b/manifests/utils/laptop/debian.pp
index e4c769c296369b34380bfc2b3e81942b8c4935bd..471a7c9405f7673abf69e395fa36d5fdf6cb1f4b 100644 (file)
--- a/manifests/utils/laptop/debian.pp
+++ b/manifests/utils/laptop/debian.pp
@@ -2,7 +2,7 @@
 class nodo::utils::laptop::debian {
   package { [ 'cpufrequtils',  'module-assistant',  'wireless-tools', 
               'wpasupplicant', 'ekiga',             'mumble',
-              'revelation',    'arp-scan',          'usb-modeswitch',
+              'arp-scan',      'usb-modeswitch',
               'iw',            'wvdial',            'wavemon',
               'btscanner',     'laptop-mode-tools', 'acpi-support',
               'tftp',          'sharutils',         'wireshark',

diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index dfbf004d528ed1a99acbda22b1a28b34652eecb3..085545abbf0f8f23f89551ffefb3ea3db3774997 100644 (file)
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -7,7 +7,8 @@ class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
               'easytag',         'gstreamer-tools',     'vlc',                'audacity',
               'opencubicplayer', 'mencoder',            'libasound2-plugins', 'lame',
               'cbrpager',        'llgal',               'darksnow',           'pavucontrol',
-              'picard',          'ffmpeg2theora',       'oggfwd',             'jhead' ]:
+              'picard',          'ffmpeg2theora',       'oggfwd',             'jhead',
+              'gxine',           'totem' ]:
     ensure => installed,
   }
 

diff --git a/manifests/utils/multimedia/scanner.pp b/manifests/utils/multimedia/scanner.pp
new file mode 100644 (file)
index 0000000..5b5302a
--- /dev/null
+++ b/manifests/utils/multimedia/scanner.pp
@@ -0,0 +1,5 @@
+class nodo::utils::multimedia::scanner {
+  package { 'xsane':
+    ensure => present,
+  }
+}

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 6573f3a80a2cf7a259bdfe3d75bf618883c66bb2..f8cb5b53dbb3cb59a37d20d1fc6b4999e21311c1 100644 (file)
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -31,7 +31,8 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   if $::lsbdistcodename != 'lenny' {
     package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
                 'maildir-utils',        'icedtea6-plugin',  'xul-ext-adblock-plus',
-                'xul-ext-noscript',     'xul-ext-firebug',  'msva-perl' ]:
+                'xul-ext-noscript',     'xul-ext-firebug',  'msva-perl',
+                'chromium-l10n' ]:
       ensure => installed,
     }
 

diff --git a/manifests/utils/office/hp.pp b/manifests/utils/office/hp.pp
new file mode 100644 (file)
index 0000000..0ca7241
--- /dev/null
+++ b/manifests/utils/office/hp.pp
@@ -0,0 +1,5 @@
+class nodo::utils::office::hp {
+  package { 'hplip-gui':
+    ensure => present,
+  }
+}

diff --git a/manifests/utils/security.pp b/manifests/utils/security.pp
index d68da7c1ed5f3dce633f235235446fd33779f6ed..f244015a99e0ab806a245b368c761ed21ad7604a 100644 (file)
--- a/manifests/utils/security.pp
+++ b/manifests/utils/security.pp
@@ -2,7 +2,7 @@ class nodo::utils::security {
   # Security
   package { [ 'apg',           'gnupg-agent',   'makepasswd', 'pwgen',          'fpm2',    'encfs',
               'signing-party', 'libnss3-tools', 'ssss',       'libgfshare-bin', 'keychain',
-              'gnupg-curl' ]:
+              'gnupg-curl',    'revelation' ]:
     ensure => installed,
   }