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

3 files changed, 10 insertions, 1 deletions

diff --git a/debian/bcfg2-report-collector.init b/debian/bcfg2-server.bcfg2-report-collector.init
index df7b751cb..df7b751cb 100755
--- a/debian/bcfg2-report-collector.init
+++ b/debian/bcfg2-server.bcfg2-report-collector.init
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
diff --git a/debian/rules b/debian/rules
index 5694e4e37..eaf80a4d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,20 @@
 #!/usr/bin/make -f
 
+# Lucid does not have dh_python2, but we would like to be able to use
+# this rules file to build on lucid as well.
+WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2")
+WITH_SPHINXDOC = $(shell test -f /usr/bin/dh_sphinxdoc && echo "--with sphinxdoc")
+
 %:
-	dh $@ --with python-support,sphinxdoc
+	dh $@ ${WITH_PYTHON2} ${WITH_SPHINXDOC}
 
 override_dh_installinit:
 	# Install bcfg2 initscript without starting it on postinst
 	dh_installinit --package=bcfg2 --no-start
 	# Install bcfg2-server initscript without starting it on postinst
 	dh_installinit --package=bcfg2-server --no-start
+	# Install bcfg2-report-collector initscript without starting it on postinst
+	dh_installinit --package=bcfg2-server --name=bcfg2-report-collector --no-start
 
 override_dh_auto_build:
 	dh_auto_build