From a2eefb9e311297bb43b694c1157cc7c4998226fc Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Thu, 30 Aug 2007 02:10:06 +0000
Subject: Debian packaging and doc build updates from Ressu

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3660 ce84e21b-d406-0410-9b95-82705330c041
---
 debian/buildsys/2.3/control.in       | 3 ++-
 debian/buildsys/2.4/control.in       | 3 ++-
 debian/buildsys/pycentral/control.in | 3 ++-
 doc/Makefile                         | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/buildsys/2.3/control.in b/debian/buildsys/2.3/control.in
index 1c7b156b8..36d394c42 100644
--- a/debian/buildsys/2.3/control.in
+++ b/debian/buildsys/2.3/control.in
@@ -19,7 +19,8 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, python2.3-lxml (>= 0.8), python2.3-gamin | python2.3-fam , libxml2-utils (>= 2.6.23), gamin | fam, ucf, bcfg2 (= ${Source-Version}), python-cheetah
+Depends: ${python:Depends}, python2.3-lxml (>= 0.8), python2.3-gamin | python2.3-fam , libxml2-utils (>= 2.6.23), gamin | fam, ucf, bcfg2 (= ${Source-Version}), python-cheetah, openssl
+Recommends: graphviz
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
diff --git a/debian/buildsys/2.4/control.in b/debian/buildsys/2.4/control.in
index 57cdecbec..903a94e5f 100644
--- a/debian/buildsys/2.4/control.in
+++ b/debian/buildsys/2.4/control.in
@@ -19,7 +19,8 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, python2.4-lxml (>= 0.9), python2.4-gamin | python2.4-fam, python2.4-pyopenssl, libxml2-utils (>= 2.6.23), gamin | fam, lsb-base (>= 3.1), ucf, bcfg2 (= ${Source-Version}), python-cheetah
+Depends: ${python:Depends}, python2.4-lxml (>= 0.9), python2.4-gamin | python2.4-fam, python2.4-pyopenssl, libxml2-utils (>= 2.6.23), gamin | fam, lsb-base (>= 3.1), ucf, bcfg2 (= ${Source-Version}), python-cheetah, openssl
+Recommends: graphviz
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
diff --git a/debian/buildsys/pycentral/control.in b/debian/buildsys/pycentral/control.in
index 78a0bc980..cc97f9c1e 100644
--- a/debian/buildsys/pycentral/control.in
+++ b/debian/buildsys/pycentral/control.in
@@ -21,8 +21,9 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, python-lxml (>= 0.9), python-gamin | python-fam , libxml2-utils (>= 2.6.23), gamin | fam, lsb-base (>= 3.1-9), ucf, bcfg2 (= ${Source-Version}), python-cheetah
+Depends: ${python:Depends}, python-lxml (>= 0.9), python-fam | python-gamin, libxml2-utils (>= 2.6.23), gamin | fam, lsb-base (>= 3.1-9), ucf, bcfg2 (= ${Source-Version}), python-cheetah, openssl
 XB-Python-Version: ${python:Versions}
+Recommends: graphviz
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
diff --git a/doc/Makefile b/doc/Makefile
index 233c2bda7..40932b19d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,10 +3,10 @@ SOURCES = *.xml
 all : manual.pdf manual.html
 
 %.fo: %.xml $(SOURCES)
-	xsltproc --stringparam body.font.family Helvetica --stringparam fop.extensions 1 /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl $< > $@
+	xsltproc --nonet --stringparam body.font.family Helvetica --stringparam fop.extensions 1 /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl $< > $@
 
 %.html: %.xml $(SOURCES)
-	xsltproc -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl $<
+	xsltproc --nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl $<
 
 %.pdf: %.fo
 	fop -fo $< -pdf $@
-- 
cgit v1.2.3-1-g7c22