diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-21 10:20:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-21 10:20:19 -0400 |
| commit | fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c (patch) | |
| tree | 5bed1930ce1edac533317749daba26680934f640 /debian | |
| parent | 29f98cdba4d7babc9fa8c0d479059060edc9aa2b (diff) | |
| parent | 1690cf04ca2b63f8312670dc6f9067fae5c8cd73 (diff) | |
| download | bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.tar.gz bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.tar.bz2 bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.zip | |
Merge branch 'maint'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 11 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 4 insertions, 14 deletions
diff --git a/debian/control b/debian/control index 6c7278e4e..20cef93c8 100644 --- a/debian/control +++ b/debian/control @@ -4,25 +4,24 @@ 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 (>= 2.6), python-setuptools, python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-lxml, python-daemon, python-cherrypy, + python-gamin, 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 Homepage: http://bcfg2.org/ Package: bcfg2 Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, debsums, python-apt, ucf, lsb-base (>= 3.1-9), python-m2crypto | python-ssl | python2.6 | python3.0 | python3.1 | python3.2 -XB-Python-Version: >= 2.3 +Depends: ${python:Depends}, ${misc:Depends}, debsums, python-apt, ucf, lsb-base (>= 3.1-9), python (>= 2.6) Description: Configuration management client Bcfg2 is a configuration management system that generates configuration sets for clients bound by client profiles. @@ -31,8 +30,7 @@ Description: Configuration management client Package: bcfg2-server Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python-ssl | python2.6 | python3.0 | python3.1 | python3.2, python-pyinotify | python-gamin, python-daemon -XB-Python-Version: >= 2.4 +Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python (>= 2.6), python-pyinotify | python-gamin, python-daemon Recommends: graphviz, patch Suggests: python-cheetah, python-genshi (>= 0.4.4), python-profiler, python-sqlalchemy (>= 0.5.0), python-django, mail-transport-agent, bcfg2-doc (= ${binary:Version}) Description: Configuration management server @@ -45,7 +43,6 @@ Package: bcfg2-web Architecture: all Depends: ${python:Depends}, ${misc:Depends}, bcfg2-server (= ${binary:Version}), python-django, Suggests: python-mysqldb, python-psycopg2, python-sqlite, libapache2-mod-wsgi -XB-Python-Version: >= 2.4 Description: Configuration management web interface Bcfg2 is a configuration management system that generates configuration sets for clients bound by client profiles. diff --git a/debian/rules b/debian/rules index fcbf6346c..5694e4e37 100755 --- a/debian/rules +++ b/debian/rules @@ -3,13 +3,6 @@ %: dh $@ --with python-support,sphinxdoc -override_dh_auto_install: - # Make the build destination dir consistent between pre-7.3 and 7.3 and - # later debhelper - see http://bcfg2.org/ticket/791 - dh_auto_install - test -d debian/tmp/usr/local && mv debian/tmp/usr/local/* debian/tmp/usr || exit 0 - test -d debian/tmp/usr/local && rmdir debian/tmp/usr/local || exit 0 - override_dh_installinit: # Install bcfg2 initscript without starting it on postinst dh_installinit --package=bcfg2 --no-start |