Merge branch 'master' into feature/autoload

4 files changed, 37 insertions, 10 deletions

diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index 4fd8412..4e62c2b 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,15 +1,26 @@
 class nodo::utils::development::ide {
-  package { [ 'exuberant-ctags', 'pnopaste-cli', 'ditz', 'mr', 'doxygen', 'agave', 'hexedit', 'ack-grep' ]:
+  package { [ 'exuberant-ctags', 'mr', 'doxygen', 'agave', 'hexedit', 'ack-grep', 'markdown' ]:
     ensure => installed,
   }
 
   # To be considered
-  # package { [ 'ttyrec', 'taskwarrior' ]:
-  #   ensure => installed,
-  # }
-
-  # Not available
-  #package { [ 'bugs-everywhere', 'silversearcher-ag' ]:
-  #  ensure => installed,
+  #package { [ 'ticgit', 'ticgitweb' ]:
+  #  ensure  => present,
   #}
+
+  # Old packages
+  package { [ 'ditz', 'pnopaste-cli' ]:
+    ensure  => $::lsbdistcodename ? {
+      'wheezy' => present,
+      default  => absent,
+    },
+  }
+
+  # Jessie onwards
+  package { [ 'ttyrec', 'taskwarrior', 'bugs-everywhere', 'silversearcher-ag' ]:
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => absent,
+      default  => present,
+    },
+  }
 }
diff --git a/manifests/utils/development/mediawiki.pp b/manifests/utils/development/mediawiki.pp
new file mode 100644
index 0000000..5ba5b55
--- /dev/null
+++ b/manifests/utils/development/mediawiki.pp
@@ -0,0 +1,8 @@
+class nodo::utils::development::mediawiki {
+  package { 'git-mediawiki':
+    ensure  => $::lsbdistcodename ? {
+      'wheezy' => absent,
+      default  => present,
+    }
+  }
+}
diff --git a/manifests/utils/development/php.pp b/manifests/utils/development/php.pp
index 608869a..6145248 100644
--- a/manifests/utils/development/php.pp
+++ b/manifests/utils/development/php.pp
@@ -1,5 +1,13 @@
 class nodo::utils::development::php {
-  package { 'php5-xdebug':
+  package { [ 'php5-xdebug', 'phpunit' ]:
     ensure  => present,
   }
+
+  # Jessie onwards
+  package { 'phpunit-git':
+    ensure => $::lsbdistcodename ? {
+      'wheezy' => absent,
+      default  => present,
+    },
+  }
 }
diff --git a/manifests/utils/development/virtual.pp b/manifests/utils/development/virtual.pp
index 57b0d6b..771f342 100644
--- a/manifests/utils/development/virtual.pp
+++ b/manifests/utils/development/virtual.pp
@@ -6,7 +6,7 @@ class nodo::utils::development::virtual {
     }
   }
 
-  package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm' ]:
+  package { [ 'virtualbox-guest-additions-iso', 'qemu', 'qemu-kvm', 'virtualbox-guest-x11' ]:
     ensure => latest,
   }