From 88837d56ed1cc57a954cf24c80f58f417488e5e8 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 16 Dec 2011 12:04:04 -0500
Subject: bddeb: improve 'bddeb' to read version and add bzr revno

This just removes one place where i had the version string
and additionally makes bddeb built debs have a revno in their
version
---
 debian.trunk/changelog |  4 ++--
 tools/bddeb            | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian.trunk/changelog b/debian.trunk/changelog
index a389d27a..53e3678c 100644
--- a/debian.trunk/changelog
+++ b/debian.trunk/changelog
@@ -1,5 +1,5 @@
-cloud-init (0.6.2) UNRELEASED; urgency=low
+cloud-init (VERSION~REVNO-0) UNRELEASED; urgency=low
 
   * build
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 01 Feb 2011 16:15:30 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 16 Dec 2011 11:50:25 -0500
diff --git a/tools/bddeb b/tools/bddeb
index 5f748919..53ac9706 100755
--- a/tools/bddeb
+++ b/tools/bddeb
@@ -7,11 +7,19 @@ rm -Rf "${TEMP_D}"; mkdir "${TEMP_D}"
 set -e
 trap "rm -Rf '${TEMP_D}'" exit
 files=$(bzr ls --versioned)
+revno=$(bzr revno)
+version=$(awk \
+  -F= '$1 ~ /version$/ { gsub("[^0-9.]","",$2); print $2; }' setup.py)
 mkdir "${TEMP_D}/cloud-init"
-tar -cf - ${files} | tar -C "${TEMP_D}/cloud-init" -xf -
+otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz"
+tar -czf - ${files} > "$otar"
+tar -C "${TEMP_D}/cloud-init" -xzf - <"$otar"
+
 if [ ! -d "${TEMP_D}/cloud-init/debian" ]; then
    rsync -a debian.trunk/ "${TEMP_D}/cloud-init/debian"
 fi
+sed -i -e "s,VERSION,$version," -e "s,REVNO,bzr$revno," \
+   "$TEMP_D/cloud-init/debian/changelog"
 cd "${TEMP_D}/cloud-init"
 debuild "$@"
 for x in ../*.deb; do
-- 
cgit v1.2.3


From a2970b0565dcd087089daa4835c3f946f51d1e3a Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 16 Dec 2011 12:05:48 -0500
Subject: setup.py: move version to 0.6.3

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4cfa8a7b..b18e2975 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def is_f(p):
     return(os.path.isfile(p))
 
 setup(name='cloud-init',
-      version='0.6.2',
+      version='0.6.3',
       description='EC2 initialisation magic',
       author='Scott Moser',
       author_email='scott.moser@canonical.com',
-- 
cgit v1.2.3