From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 22 Dec 2011 13:05:41 +0000 (-0200)
Subject: Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166;p=puppet-nodo.git

Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo

Conflicts:
	manifests/subsystems/utils/debian.pp
---

eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166
diff --cc manifests/subsystems/utils/debian.pp
index c38b50e,5f48aeb..e31011b
--- a/manifests/subsystems/utils/debian.pp
+++ b/manifests/subsystems/utils/debian.pp
@@@ -53,11 -53,11 +53,11 @@@ class utils::personal::debian 
    }
  
    # Development
--  package { [ 'debhelper',  'gitk',      'git-gui',         'subversion',   'python-stdeb',
--              'fakeroot',   'dupload',   'autotools-dev',   'dh-make',      'doxygen',
--              'tig',        'mercurial', 'exuberant-ctags', 'reportbug',    'debian-keyring',
--              'devscripts', 'pbuilder',  'build-essential', 'pnopaste-cli', 'agave',
-               'quilt' ]:
 -              'cdbs',       'dh-buildinfo' ]:
++  package { [ 'debhelper',  'gitk',         'git-gui',         'subversion',   'python-stdeb',
++              'fakeroot',   'dupload',      'autotools-dev',   'dh-make',      'doxygen',
++              'tig',        'mercurial',    'exuberant-ctags', 'reportbug',    'debian-keyring',
++              'devscripts', 'pbuilder',     'build-essential', 'pnopaste-cli', 'agave',
++              'cdbs',       'dh-buildinfo', 'quilt' ]:
      ensure => installed,
    }