From 2c28fa24ba4abad25abb3c664f9227045dd66582 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 22 Nov 2015 13:16:58 -0200
Subject: Merge taskwarrior package definition

---
 manifests/utils/development/ide.pp |  2 +-
 manifests/utils/office.pp          | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index ba040b5..9d60383 100644
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -17,7 +17,7 @@ class nodo::utils::development::ide {
   }
 
   # Jessie onwards
-  package { [ 'ttyrec', 'taskwarrior', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]:
+  package { [ 'ttyrec', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]:
     ensure => $::lsbdistcodename ? {
       'wheezy' => absent,
       default  => present,
diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 1ef8712..47e92a9 100644
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -6,11 +6,19 @@ class nodo::utils::office {
               'gnucash',             'worklog',             'pdftk',
               'calibre',             'fbreader',            'gobby-0.5',
               'mat',                 'evince',              'jekyll',
-              'task',                'aewan',               'autocutsel',
+              'aewan',               'autocutsel',
               'parcellite' ]:
     ensure => installed,
   }
 
+  package { 'taskwarrior':
+    ensure  => present,
+    name    => $::lsbdistcodename ? {
+      'wheezy' => 'task',
+      default  => 'taskwarrior',
+    },
+  }
+
   # Finance
   package { [ 'ledger', 'clipf', 'misery' ]:
     ensure  => present,
-- 
cgit v1.2.3