Cleanup

diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp
index 8584e5f60332e1e521a5aaf1fc6e369f2036600f..b15c42154f9d3e3d394eb5d4840af419defd3d47 100644 (file)
--- a/manifests/subsystems/utils/debian.pp
+++ b/manifests/subsystems/utils/debian.pp
@@ -1,6 +1,7 @@
 class utils::personal::debian {
   # System
-  package { [ 'libpam-mount', 'ecryptfs-utils', 'openjdk-6-jre', 'gawk', ]:
+  package { [ 'libpam-mount', 'ecryptfs-utils', 'openjdk-6-jre', 'gawk',
+              'sun-java6-jre', ]:
     ensure => installed,
   }
 
@@ -25,7 +26,7 @@ class utils::personal::debian {
               'sc',                  'antiword',            'broffice.org',
               'kalarm',              'texlive-latex-base',  'texlive-latex-recommended',
               'texlive-latex-extra', 'pandoc',              'gnumeric',
-              'cups-client', ]:
+              'cups-client',         'hplip', ]:
     ensure => installed,
   }
 
@@ -35,7 +36,7 @@ class utils::personal::debian {
               'irssi-plugin-silc', 'bogofilter', 'fetchmail',   'procmail',
               'msmtp',             'mairix',     'konqueror',   'bittorrent',
               'irssi-scripts',     'links',      'twinkle',     'bittornado',
-              'rtorrent', ]:
+              'rtorrent',          'iceweasel', ]:
     ensure => installed,
   }
 
@@ -57,10 +58,6 @@ class utils::personal::debian {
     ensure => installed,
   }
 
-  package { [ 'iceweasel', 'sun-java6-jre', 'hplip' ]:
-    ensure => installed,
-  }
-
   # Java alternative
   file { "/etc/alternatives/java":
     ensure  => "/usr/lib/jvm/java-6-sun/jre/bin/java",