From db16bf64894c00884a1396ec84e1df01fcac7026 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 15 Jul 2009 19:47:00 +0000
Subject: rpm/deb packaging: Remove remaining Cheetah dependencies

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5328 ce84e21b-d406-0410-9b95-82705330c041
---
 debian/buildsys/2.3/control.in       | 2 +-
 debian/buildsys/2.4/control.in       | 2 +-
 debian/buildsys/pycentral/control.in | 2 +-
 debian/changelog                     | 6 ++++++
 redhat/bcfg2.spec.in                 | 3 +++
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/buildsys/2.3/control.in b/debian/buildsys/2.3/control.in
index f4581b7d5..407587d15 100644
--- a/debian/buildsys/2.3/control.in
+++ b/debian/buildsys/2.3/control.in
@@ -18,7 +18,7 @@ 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, openssl
+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}), openssl
 Recommends: graphviz
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
diff --git a/debian/buildsys/2.4/control.in b/debian/buildsys/2.4/control.in
index 35c7ae1d6..58da98dc1 100644
--- a/debian/buildsys/2.4/control.in
+++ b/debian/buildsys/2.4/control.in
@@ -18,7 +18,7 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, python-lxml (>=0.9) | 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
+Depends: ${python:Depends}, python-lxml (>=0.9) | 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}), openssl
 Recommends: graphviz
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
diff --git a/debian/buildsys/pycentral/control.in b/debian/buildsys/pycentral/control.in
index 9c333aa06..915f3c9b3 100644
--- a/debian/buildsys/pycentral/control.in
+++ b/debian/buildsys/pycentral/control.in
@@ -20,7 +20,7 @@ Description: Configuration management client
 
 Package: bcfg2-server
 Architecture: all
-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
+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}), openssl
 Recommends: python-genshi (>= 0.4.4), graphviz
 XB-Python-Version: ${python:Versions}
 Description: Configuration management server
diff --git a/debian/changelog b/debian/changelog
index 6680a07d3..586f6f2e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (1.0pre4-0.2) unstable; urgency=low
+
+  * Remove python-cheetah dependency
+
+ -- Sol Jerome <solj@ices.utexas.edu>  Wed, 15 Jun 2009 14:30:25 -0500
+
 bcfg2 (1.0pre4-0.1) unstable; urgency=low
 
   * new prerelease
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index ca3c8b531..447e06dac 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -222,6 +222,9 @@ fi
 %dir %{_var}/lib/bcfg2
 
 %changelog
+* Wed Jun 15 2009 Sol Jerome <solj@ices.utexas.edu> 1.0pre4-0.1
+- Remove python-cheetah dependency
+
 * Tue Oct 28 2008 Robin Bowes <robin@robinbowes.com> 0.9.6-0.2
 - spec file is now created dynamically so Version & Release
   can be hard-coded so SRPM can be rebuilt without the Makefile
-- 
cgit v1.2.3-1-g7c22