summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2013-06-11 23:28:54 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-07-03 12:03:02 +0200
commit9841c5d04dbafae87532aa623bba29e1f53954f0 (patch)
tree0fa810cb3b6e3a8bf998fd3a0fd74ea45323651a
parentd5818969d7288f5383653c2d9017d58a9dad3c56 (diff)
downloadbcfg2-9841c5d04dbafae87532aa623bba29e1f53954f0.tar.gz
bcfg2-9841c5d04dbafae87532aa623bba29e1f53954f0.tar.bz2
bcfg2-9841c5d04dbafae87532aa623bba29e1f53954f0.zip
debian: remove sphinx dependency (not available under squeeze)debian/1.3.2-spline1
-rw-r--r--debian/bcfg2-doc.docs1
-rw-r--r--debian/control14
-rwxr-xr-xdebian/rules1
3 files changed, 1 insertions, 15 deletions
diff --git a/debian/bcfg2-doc.docs b/debian/bcfg2-doc.docs
deleted file mode 100644
index 6f7511e54..000000000
--- a/debian/bcfg2-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/sphinx/html
diff --git a/debian/control b/debian/control
index edc4003dd..c2a712003 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Sami Haahtinen <ressu@debian.org>
Build-Depends: debhelper (>= 7.0.50~),
python (>= 2.6),
python-setuptools,
- python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
python-lxml,
python-daemon,
python-cherrypy3,
@@ -14,9 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~),
python-genshi,
python-pyinotify,
python-m2crypto,
- python-doc,
- python-mock,
- python-mock-doc
+ python-doc
Build-Depends-Indep: python-support (>= 0.5.3)
Standards-Version: 3.8.0.0
Homepage: http://bcfg2.org/
@@ -49,12 +46,3 @@ Description: Configuration management web interface
Bcfg2 is a configuration management system that generates configuration sets
for clients bound by client profiles.
bcfg2-web is the reporting server for bcfg2.
-
-Package: bcfg2-doc
-Section: doc
-Architecture: all
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
-Description: Configuration management system documentation
- Bcfg2 is a configuration management system that generates configuration sets
- for clients bound by client profiles.
- bcfg2-doc is the documentation for bcfg2.
diff --git a/debian/rules b/debian/rules
index eaf80a4d7..b4500e4a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ override_dh_installinit:
override_dh_auto_build:
dh_auto_build
- python setup.py build_sphinx
override_dh_auto_clean:
dh_auto_clean