Packages not available on jessie

diff --git a/manifests/utils/development/puppet.pp b/manifests/utils/development/puppet.pp
index 7285eae743ba44407ed1eae604948689d6a2bd6c..bf26dbbb0494875e318d8749f4dd03cd8e3adc66 100644 (file)
--- a/manifests/utils/development/puppet.pp
+++ b/manifests/utils/development/puppet.pp
@@ -1,5 +1,12 @@
 class nodo::utils::development::puppet {
-  package { [ 'puppet-lint', 'ruby-hiera-puppet' ]:
+  package { 'puppet-lint':
     ensure => installed,
   }
+
+  package { 'ruby-hiera-puppet':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
 }

diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp
index 1a1d265712c4cb320b03eb5056cd32a383ddb17c..235d88ac0c752c8b0d1c42072d3217322fd2fbcb 100644 (file)
--- a/manifests/utils/interface.pp
+++ b/manifests/utils/interface.pp
@@ -14,7 +14,7 @@ class nodo::utils::interface inherits nodo::utils::interface::console {
   }
 
   # Fonts
-  package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'ttf-inconsolata' ]:
+  package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'fonts-inconsolata' ]:
     ensure => installed,
   }
 

diff --git a/manifests/utils/network.pp b/manifests/utils/network.pp
index 7221765017b080f0ba867011d24289db202a9b92..cd64f931556f7b309db9c5bc746b059d8f03ab07 100644 (file)
--- a/manifests/utils/network.pp
+++ b/manifests/utils/network.pp
@@ -4,7 +4,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
               'newsbeuter',         'nicotine',              'sshfs',
               'bogofilter',         'fetchmail',             'procmail',
               'msmtp',              'mairix',                'notmuch-mutt',
-              'links',              'gftp',                  'iceweasel',
+              'links',              'iceweasel',
               'openvpn',            'pssh',                  'mutt-patched',
               'pidgin',             'pidgin-encryption',     'pidgin-openpgp',
               'pidgin-otr',         'pidgin-privacy-please', 'pidgin-plugin-pack',
@@ -34,7 +34,7 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   # Squeeze (or newer) packages
   if $::lsbdistcodename != 'lenny' {
     package { [ 'xul-ext-monkeysphere', 'chromium-browser', 'libical-parser-perl',
-                'maildir-utils',        'icedtea6-plugin',  'xul-ext-noscript',
+                'maildir-utils',        'xul-ext-noscript',
                 'xul-ext-firebug',      'msva-perl',        'chromium-l10n' ]:
       ensure => installed,
     }
@@ -67,6 +67,14 @@ class nodo::utils::network inherits nodo::utils::network::minimal {
   #  ensure => installed,
   #}
 
+  # Wheezy only
+  package { [ 'gftp', 'icedtea6-plugin' ]:
+    ensure => $::lsbdistcodename ? {
+      'lenny' => present,
+      default => absent,
+    },
+  }
+
   # Lenny only
   package { [ 'mozilla-firefox-adblock' ]:
     ensure => $::lsbdistcodename ? {