Spliting custom debian packages

diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp
index bd722c5a7cfcbc3b2ea2e24c1c8e8b430149707f..8830e70d3cf02bb2ec3696eb0535798ac75e35f0 100644 (file)
--- a/manifests/subsystems/utils.pp
+++ b/manifests/subsystems/utils.pp
@@ -30,7 +30,7 @@ class utils::web {
 class utils::personal {
   package { [ 'awesome',           'alsa-tools-gui',          'mutt',
               'irssi',             'offlineimap',             'wyrd',
-              'mp3blaster',        'iceweasel',               'eterm',
+              'mp3blaster',        'eterm',                   'epiphany-browser',
               'libpam-mount',      'debhelper',               'fluxbox',
               'gdm',               'ecryptfs-utils',          'newsbeuter',
               'bitlbee',           'nicotine',                'silc',
@@ -39,22 +39,27 @@ class utils::personal {
               'gnupg-agent',       'xterm',                   'bash-completion',
               'fetchmail',         'whois',                   'xfonts-terminus',
               'gnumeric',          'alsa-utils',              'sc',
-              'gawk',              'telnet',                  'fpm',
+              'gawk',              'telnet',                  'fpm2',
               'procmail',          'msmtp',                   'netpbm',
               'gqview',            'antiword',                'mairix',
               'gitk',              'konqueror',               'mpg123',
               'audacious',         'qjackctl',                'bittorrent',
               'subversion',        'fortunes-br',             'xine-ui',
-              'broffice.org',      'mozilla-firefox-adblock', 'cups-client',
+              'broffice.org',      'cups-client',             'xscreensaver',
               'amarok',            'mc',                      'wodim',
               'genisoimage',       'dvd+rw-tools',            'inkscape',
-              'python-stdeb',      'openjdk-6-jre',           'sun-java6-jre',
-              'epiphany-browser',  'xscreensaver',            'unrar',
+              'python-stdeb',      'openjdk-6-jre',           'unrar',
               'fakeroot',          'dupload',                 'autotools-dev',
               'dh-make' ]:
     ensure => installed,
   }
 
+  if $operatingsystem = 'debian' {
+    package { [ 'mozilla-firefox-adblock', 'iceweasel', 'sun-java6-jre', ]:
+      ensure => installed,
+    }
+  }
+
   # Gem packages
   package { 'capistrano':
     ensure   => installed,