1. Change these to be templates where possible.

2. Rename to be a debian subdir, matching the redhat subdir.

7 files changed, 4 insertions, 6 deletions

diff --git a/packages/debian.trunk/changelog b/packages/debian/changelog
index a36d00d6..ac5bcf98 100644
--- a/packages/debian.trunk/changelog
+++ b/packages/debian/changelog
@@ -1,4 +1,4 @@
-cloud-init (VERSION~REVNO-1) UNRELEASED; urgency=low
+cloud-init ({{version}}~{{revision}}-1) UNRELEASED; urgency=low
 
   * build
 
diff --git a/packages/debian.trunk/compat b/packages/debian/compat
index 7ed6ff82..7ed6ff82 100644
--- a/packages/debian.trunk/compat
+++ b/packages/debian/compat
diff --git a/packages/debian.trunk/control b/packages/debian/control
index f0dcef6a..e00901af 100644
--- a/packages/debian.trunk/control
+++ b/packages/debian/control
@@ -17,12 +17,10 @@ Architecture: all
 Depends: cloud-utils,
          procps,
          python,
-         python-boto (>=2.0),
-         python-cheetah,
-         python-configobj,
-         python-oauth,
+{{for r in requires}}
+         {{r}},
+{{endfor}}
          python-software-properties,
-         python-yaml,
          ${misc:Depends},
          ${python:Depends}
 XB-Python-Version: ${python:Versions}
diff --git a/packages/debian.trunk/copyright b/packages/debian/copyright
index dc993525..dc993525 100644
--- a/packages/debian.trunk/copyright
+++ b/packages/debian/copyright
diff --git a/packages/debian.trunk/dirs b/packages/debian/dirs
index f3de468d..f3de468d 100644
--- a/packages/debian.trunk/dirs
+++ b/packages/debian/dirs
diff --git a/packages/debian.trunk/pycompat b/packages/debian/pycompat
index 0cfbf088..0cfbf088 100644
--- a/packages/debian.trunk/pycompat
+++ b/packages/debian/pycompat
diff --git a/packages/debian.trunk/rules b/packages/debian/rules
index a907b594..a907b594 100755
--- a/packages/debian.trunk/rules
+++ b/packages/debian/rules