diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 08:19:09 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 08:19:09 -0400 |
| commit | 317d3087459538877100032733477362f456f550 (patch) | |
| tree | 27fabdff3649c75bcdd9de8ccde5c5826c679e5e /debian/control | |
| parent | 9d5e8170292e17d3b087878918562dcf502f70d4 (diff) | |
| parent | a519dc9298317b678bca43597892df5aa13d874d (diff) | |
| download | bcfg2-317d3087459538877100032733477362f456f550.tar.gz bcfg2-317d3087459538877100032733477362f456f550.tar.bz2 bcfg2-317d3087459538877100032733477362f456f550.zip | |
Merge branch 'maint'
Conflicts:
doc/server/plugins/generators/cfg.txt
doc/server/plugins/generators/tcheetah.txt
src/lib/Bcfg2/Server/Admin/Xcmd.py
src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 20cef93c8..7b27b27ed 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,11 @@ Build-Depends: debhelper (>= 7.0.50~), python-daemon, python-cherrypy, python-gamin, + python-genshi, python-pyinotify, python-m2crypto, python-doc, + python-mock, python-mock-doc Build-Depends-Indep: python-support (>= 0.5.3) Standards-Version: 3.8.0.0 |