From 48ec119bd68dfa090785db7758c542878ee5fc56 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Mon, 9 Jul 2012 17:09:04 -0400
Subject: fix bddeb and brpm: by renaming packaging files that are templates

In cherry picking the cheetah commit, I missed the rename of these files.
  packages/debian/changelog => packages/debian/changelog.in
  packages/debian/control => packages/debian/control.in
  packages/redhat/cloud-init.spec => packages/redhat/cloud-init.spec.in
---
 packages/debian/changelog    |  6 ------
 packages/debian/changelog.in |  6 ++++++
 packages/debian/control      | 33 ---------------------------------
 packages/debian/control.in   | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 packages/debian/changelog
 create mode 100644 packages/debian/changelog.in
 delete mode 100644 packages/debian/control
 create mode 100644 packages/debian/control.in

(limited to 'packages/debian')

diff --git a/packages/debian/changelog b/packages/debian/changelog
deleted file mode 100644
index eda08c57..00000000
--- a/packages/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-## This is a cheetah template
-cloud-init (${version}~${revision}-1) UNRELEASED; urgency=low
-
-  * build
-
- -- Scott Moser <smoser@ubuntu.com>  Fri, 16 Dec 2011 11:50:25 -0500
diff --git a/packages/debian/changelog.in b/packages/debian/changelog.in
new file mode 100644
index 00000000..eda08c57
--- /dev/null
+++ b/packages/debian/changelog.in
@@ -0,0 +1,6 @@
+## This is a cheetah template
+cloud-init (${version}~${revision}-1) UNRELEASED; urgency=low
+
+  * build
+
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 16 Dec 2011 11:50:25 -0500
diff --git a/packages/debian/control b/packages/debian/control
deleted file mode 100644
index 4e151e3e..00000000
--- a/packages/debian/control
+++ /dev/null
@@ -1,33 +0,0 @@
-## 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),
-               python (>= 2.6.6-3~),
-               python-nose,
-               pyflakes,
-               pylint,
-               python-setuptools,
-               python-cheetah,
-               python-mocker,
-               python-setuptools
-XS-Python-Version: all
-Standards-Version: 3.9.3
-
-Package: cloud-init
-Architecture: all
-Depends: cloud-utils,
-         procps,
-         python,
-#for $r in $requires
-         ${r},
-#end for
-         python-software-properties,
-         \${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.
diff --git a/packages/debian/control.in b/packages/debian/control.in
new file mode 100644
index 00000000..4e151e3e
--- /dev/null
+++ b/packages/debian/control.in
@@ -0,0 +1,33 @@
+## 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),
+               python (>= 2.6.6-3~),
+               python-nose,
+               pyflakes,
+               pylint,
+               python-setuptools,
+               python-cheetah,
+               python-mocker,
+               python-setuptools
+XS-Python-Version: all
+Standards-Version: 3.9.3
+
+Package: cloud-init
+Architecture: all
+Depends: cloud-utils,
+         procps,
+         python,
+#for $r in $requires
+         ${r},
+#end for
+         python-software-properties,
+         \${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