diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-12-16 12:06:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-12-16 12:06:55 -0500 |
| commit | 7c0dfc87c83292d621bde66346b5ed1cdd2af7be (patch) | |
| tree | 555ef3a552097a17c54c12b2f1505b9146271198 | |
| parent | e25e758be42c482a0273df6c9e80069bf6ef147c (diff) | |
| parent | a2970b0565dcd087089daa4835c3f946f51d1e3a (diff) | |
| download | vyos-cloud-init-7c0dfc87c83292d621bde66346b5ed1cdd2af7be.tar.gz vyos-cloud-init-7c0dfc87c83292d621bde66346b5ed1cdd2af7be.zip | |
sync from trunk
| -rw-r--r-- | debian.trunk/changelog | 4 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rwxr-xr-x | tools/bddeb | 10 |
3 files changed, 12 insertions, 4 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 @@ -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', 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 |