summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-11-15 12:20:34 -0600
committerSol Jerome <sol.jerome@gmail.com>2012-11-15 12:20:34 -0600
commit1d3bc1087e65d906f4ef20f72f394ca8d35b078d (patch)
tree7492e0328679325e4e20623d4b175168bf04194b
parente0dfe01c7b0c1cfdb462ebe2663b9f95f9035e87 (diff)
downloadbcfg2-1d3bc1087e65d906f4ef20f72f394ca8d35b078d.tar.gz
bcfg2-1d3bc1087e65d906f4ef20f72f394ca8d35b078d.tar.bz2
bcfg2-1d3bc1087e65d906f4ef20f72f394ca8d35b078d.zip
debian: Sync some upstream changes
These are changes from Arto Jantunen's git branch located at git://anonscm.debian.org/git/collab-maint/bcfg2.git. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--debian/bcfg2-doc.docs1
-rw-r--r--debian/bcfg2-doc.links1
-rw-r--r--debian/control2
3 files changed, 2 insertions, 2 deletions
diff --git a/debian/bcfg2-doc.docs b/debian/bcfg2-doc.docs
new file mode 100644
index 000000000..6f7511e54
--- /dev/null
+++ b/debian/bcfg2-doc.docs
@@ -0,0 +1 @@
+build/sphinx/html
diff --git a/debian/bcfg2-doc.links b/debian/bcfg2-doc.links
deleted file mode 100644
index 133a58e2e..000000000
--- a/debian/bcfg2-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/bcfg2/html/_sources usr/share/doc/bcfg2/rst
diff --git a/debian/control b/debian/control
index 28ddbf9aa..be03f4942 100644
--- a/debian/control
+++ b/debian/control
@@ -42,9 +42,9 @@ Description: Configuration management web interface
bcfg2-web is the reporting server for bcfg2.
Package: bcfg2-doc
+Section: 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.