Merge branch 'master' into develop

2 files changed, 18 insertions, 2 deletions

diff --git a/manifests/utils/development/git.pp b/manifests/utils/development/git.pp
index 03790f3..b5fc5aa 100644
--- a/manifests/utils/development/git.pp
+++ b/manifests/utils/development/git.pp
@@ -1,9 +1,10 @@
 class nodo::utils::development::git {
-  package { [ 'gitk',       'git-gui',  'tig',    'git-cola',          'git-stuff', 'legit',
+  package { [ 'gitk',       'git-gui',  'tig',    'git-cola',          'legit',
               'git-extras', 'git-flow', 'topgit', 'git-remote-gcrypt', ]:
     ensure => installed,
   }
 
+  # Newer packages
   package { 'git-crypt':
     ensure => $::lsbdistcodename ? {
       'stretch' => present,
@@ -11,4 +12,12 @@ class nodo::utils::development::git {
       default   => absent,
     }
   }
+
+  # Wheezy only
+  package { 'git-stuff':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
 }
diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
index 9423f14..e654e38 100644
--- a/manifests/utils/development/system.pp
+++ b/manifests/utils/development/system.pp
@@ -1,5 +1,12 @@
 class nodo::utils::development::system {
-  package { [ 'debirf', 'xorriso', 'unetbootin', 'kpartx', 'openocd', 'live-build' ]:
+  package { [ 'debirf', 'xorriso', 'kpartx', 'openocd', 'live-build' ]:
     ensure => installed,
   }
+
+  package { 'unetbootin':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
 }