summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/bcfg2-doc.docs1
-rw-r--r--debian/changelog6
-rw-r--r--debian/control14
-rwxr-xr-xdebian/rules1
4 files changed, 7 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/changelog b/debian/changelog
index 2bb6023e7..159027cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.3.4-spline2~bpo60+1) squeeze-backports; urgency=low
+
+ * Rebuild for squeeze-backports.
+
+ -- Alexander Sulfrian <alex@spline.inf.fu-berlin.de> Wed, 26 Feb 2014 13:46:58 +0100
+
bcfg2 (1.3.4-spline2) unstable; urgency=low
* Plugins/Packages/Portage: do not try to update the {var,port}tree instances
diff --git a/debian/control b/debian/control
index aee6f1c24..85b27fe99 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-boto,
@@ -15,9 +14,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/
@@ -50,12 +47,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