summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-25 23:56:15 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-25 23:56:15 -0700
commit86d7dfa8dae0b53866462ce8e737309a40436402 (patch)
tree87dc3da284fe0c886ad5de53689c0d3996439d44
parentc9fa666745567d7e3c9d55a83dfedad40e13ea9a (diff)
downloadvyos-cloud-init-86d7dfa8dae0b53866462ce8e737309a40436402.tar.gz
vyos-cloud-init-86d7dfa8dae0b53866462ce8e737309a40436402.zip
1. Change these to be templates where possible.
2. Rename to be a debian subdir, matching the redhat subdir.
-rw-r--r--packages/debian/changelog (renamed from packages/debian.trunk/changelog)2
-rw-r--r--packages/debian/compat (renamed from packages/debian.trunk/compat)0
-rw-r--r--packages/debian/control (renamed from packages/debian.trunk/control)8
-rw-r--r--packages/debian/copyright (renamed from packages/debian.trunk/copyright)0
-rw-r--r--packages/debian/dirs (renamed from packages/debian.trunk/dirs)0
-rw-r--r--packages/debian/pycompat (renamed from packages/debian.trunk/pycompat)0
-rwxr-xr-xpackages/debian/rules (renamed from packages/debian.trunk/rules)0
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