8 files changed, 34 insertions, 33 deletions
diff --git a/debian/bcfg2-doc.links b/debian/bcfg2-doc.links
new file mode 100644
index 000000000..133a58e2e
--- /dev/null
+++ b/debian/bcfg2-doc.links
@@ -0,0 +1 @@
+usr/share/doc/bcfg2/html/_sources usr/share/doc/bcfg2/rst
diff --git a/debian/bcfg2-server.README.debian b/debian/bcfg2-server.README.Debian
index 185dd2450..185dd2450 100644
--- a/debian/bcfg2-server.README.debian
+++ b/debian/bcfg2-server.README.Debian
diff --git a/debian/bcfg2-server.logcheck.ignore.server b/debian/bcfg2-server.logcheck.ignore.server
index a3e5a5a8d..136384f00 100644
--- a/debian/bcfg2-server.logcheck.ignore.server
+++ b/debian/bcfg2-server.logcheck.ignore.server
@@ -1,4 +1,4 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ bcfg2-server\[[0-9]+\]: Processed [0-9]+ (fam|gamin) events in [0-9.]+ seconds\. [0-9]+ coalesced$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ bcfg2-server\[[0-9]+\]: Generated config for [._[:alnum:]-]+ in [0-9.]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ bcfg2-server\[[0-9]+\]: Generated config for [._[:alnum:]-]+ in [0-9.]+ s$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ bcfg2-server\[[0-9]+\]: Client [._[:alnum:]-]+ reported state (clean|dirty)$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ bcfg2-server\[[0-9]+\]: Suppressing event for bogus file .*$
diff --git a/debian/bcfg2-server.preinst b/debian/bcfg2-server.preinst
deleted file mode 100644
index 2eb87e99b..000000000
--- a/debian/bcfg2-server.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# This file can be removed after a few releases.
-set -e
-if [ "$1" = upgrade ]
-then
-  if dpkg --compare-versions "$2" lt 1.0pre5-0.3; then
-    if which pycentral > /dev/null; then
-      pycentral pkgremove bcfg2-server
-    fi
-  fi
-fi
-
-#DEBHELPER#
diff --git a/debian/bcfg2.preinst b/debian/bcfg2.preinst
deleted file mode 100644
index be4b1444a..000000000
--- a/debian/bcfg2.preinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# This file can be removed after a few releases.
-set -e
-if [ "$1" = upgrade ]
-then
-  if dpkg --compare-versions "$2" lt 1.0pre5-0.3; then
-    if which pycentral > /dev/null; then
-      pycentral pkgremove bcfg2
-    fi
-  fi
-fi
-
-#DEBHELPER#
diff --git a/debian/changelog b/debian/changelog
index d6f08a101..2557dd66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+bcfg2 (1.2.2-0.0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com>  Sat, 17 Mar 2012 14:41:17 -0500
+
+bcfg2 (1.2.1-0.0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sol Jerome <sol.jerome@gmail.com>  Fri, 27 Jan 2012 13:55:45 -0600
+
 bcfg2 (1.2.0-0.0) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 8f4300fee..7835334da 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.3.5-7), python-setuptools, python-sphinx (>= 1.0.7+dfsg) | python3-sphinx
 Build-Depends-Indep: python-support (>= 0.5.3)
 Standards-Version: 3.8.0.0
 XS-Python-Version: >= 2.3
@@ -24,7 +24,7 @@ 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-gamin
 XB-Python-Version: >= 2.4
 Recommends: graphviz, patch
-Suggests: python-cheetah, python-genshi (>= 0.4.4), python-profiler, sqlalchemy (>= 0.5.0), python-django, mail-transport-agent
+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
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
@@ -33,10 +33,19 @@ Description: Configuration management server
 
 Package: bcfg2-web
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, bcfg2 (= ${binary:Version}), python-django,
+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.
  bcfg2-web is the reporting server for bcfg2.
+
+Package: bcfg2-doc
+Architecture: all
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+XB-Python-Version: >= 2.4
+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 1638b8415..30fd64a43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 
-WSGI_LOC = $(shell find debian/bcfg2-server/ -name reports.wsgi | perl -p -e 's|debian/bcfg2-server||')
-
 %:
-	dh --with python-support $@
+	dh $@ --with python-support,sphinxdoc
 
 override_dh_auto_install:
 	# Make the build destination dir consistent between pre-7.3 and 7.3 and 
@@ -18,3 +16,10 @@ override_dh_installinit:
 	# Install bcfg2-server initscript without starting it on postinst
 	dh_installinit --package=bcfg2-server --no-start
 
+override_dh_installdocs:
+	python setup.py build_sphinx
+	dh_installdocs build/sphinx/html
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build