From 75af023c864d1b6c4e48788b1b4cf7aad5eb2204 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 9 Jul 2012 16:41:45 -0400
Subject: Revert back to using cheetah + adjust resultant code + templates

At this point there is a mixture of "double hash" cheetah comments and '#*'
cheetah comments.
---
 packages/debian/changelog |  3 ++-
 packages/debian/control   | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'packages/debian')

diff --git a/packages/debian/changelog b/packages/debian/changelog
index ac5bcf98..eda08c57 100644
--- a/packages/debian/changelog
+++ b/packages/debian/changelog
@@ -1,4 +1,5 @@
-cloud-init ({{version}}~{{revision}}-1) UNRELEASED; urgency=low
+## This is a cheetah template
+cloud-init (${version}~${revision}-1) UNRELEASED; urgency=low
 
   * build
 
diff --git a/packages/debian/control b/packages/debian/control
index 926228d5..4e151e3e 100644
--- a/packages/debian/control
+++ b/packages/debian/control
@@ -1,13 +1,16 @@
+## This is a cheetah template
 Source: cloud-init
 Section: admin
 Priority: extra
 Maintainer: Scott Moser <smoser@ubuntu.com>
 Build-Depends: cdbs, 
-               debhelper (>= 5.0.38), 
+               debhelper (>= 5.0.38),
                python (>= 2.6.6-3~),
                python-nose,
                pyflakes,
                pylint,
+               python-setuptools,
+               python-cheetah,
                python-mocker,
                python-setuptools
 XS-Python-Version: all
@@ -18,13 +21,13 @@ Architecture: all
 Depends: cloud-utils,
          procps,
          python,
-{{for r in requires}}
-         {{r}},
-{{endfor}}
+#for $r in $requires
+         ${r},
+#end for
          python-software-properties,
-         ${misc:Depends},
-         ${python:Depends}
-XB-Python-Version: ${python:Versions}
+         \${misc:Depends},
+         \${python:Depends}
+XB-Python-Version: \${python:Versions}
 Description: Init scripts for cloud instances
  Cloud instances need special scripts to run during initialisation
  to retrieve and install ssh keys and to let the user run various scripts.
-- 
cgit v1.2.3