diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-20 10:38:38 -0500 |
| commit | 69ebf49d54aac70a42142d0d04e562496bce58ea (patch) | |
| tree | ad0f346ff95a14ad49440128ff76d7e2b3f0816a /debian/control | |
| parent | 602ba6af6bd1c9b3910940dee766660ab8e81a19 (diff) | |
| parent | e17e41dcff096ead7e129a0db063f75de44aaa2b (diff) | |
| download | bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.gz bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.tar.bz2 bcfg2-69ebf49d54aac70a42142d0d04e562496bce58ea.zip | |
Merge branch 'master' into 1.4.x
Conflicts:
doc/appendix/contributors.txt
schemas/bundle.xsd
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Server/Encryption.py
src/lib/Bcfg2/Server/Lint/Genshi.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/Decisions.py
src/lib/Bcfg2/Server/Plugins/TemplateHelper.py
src/sbin/bcfg2-test
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
tools/bcfg2-profile-templates.py
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/debian/control b/debian/control index e2826a057..6c7278e4e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,17 @@ Section: admin Priority: optional Maintainer: Arto Jantunen <viiru@debian.org> Uploaders: Sami Haahtinen <ressu@debian.org> -Build-Depends: debhelper (>= 7.0.50~), python (>= 2.3.5-7), python-setuptools, python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-lxml, python-daemon, python-cherrypy, python-pyinotify, python-mock, python-m2crypto, python-doc, python-mock-doc +Build-Depends: debhelper (>= 7.0.50~), + python (>= 2.3.5-7), + python-setuptools, + python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, + python-lxml, + python-daemon, + python-cherrypy, + python-pyinotify, + python-m2crypto, + python-doc, + python-mock-doc Build-Depends-Indep: python-support (>= 0.5.3) Standards-Version: 3.8.0.0 XS-Python-Version: >= 2.3 |