diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-12-22 11:05:41 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-12-22 11:05:41 -0200 |
| commit | eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166 (patch) | |
| tree | 519073c17211c49855915b459fc0d5268baca426 | |
| parent | 869a40afda09c344d8e652c5f08d06e407e3ceae (diff) | |
| parent | 4c5b595cf0e0ebcff1c49b916bbce3b4979cc82f (diff) | |
| download | puppet-nodo-eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166.tar.gz puppet-nodo-eb33a9ec1f8e39d439f8b9ab93324daa6cb8b166.tar.bz2 | |
Merge branch 'master' of ssh://git.fluxo.info:2208/puppet-nodo
Conflicts:
manifests/subsystems/utils/debian.pp
| -rw-r--r-- | manifests/subsystems/utils/debian.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/subsystems/utils/debian.pp b/manifests/subsystems/utils/debian.pp index c38b50e..e31011b 100644 --- a/manifests/subsystems/utils/debian.pp +++ b/manifests/subsystems/utils/debian.pp @@ -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' ]: + 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, } |