From d221d29fb214f831536d696231a756d7812432e2 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 20 Jun 2012 16:24:24 -0400
Subject: [PATCH] update tools/bddeb and debian.trunk packaging

 * debian.trunk/changelog: increase debian version to '1' to avoid lintian
   error
 * debian.trunk/control: bump standards version
 * debian.trunk/rules: remove cloud-init-run-module symlink (been deprecated
   for some time)
 * tools/bddeb: read version from ChangeLog rather than setup.py
---
 debian.trunk/changelog | 2 +-
 debian.trunk/control   | 2 +-
 debian.trunk/rules     | 1 -
 setup.py               | 3 +--
 tools/bddeb            | 6 +++---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian.trunk/changelog b/debian.trunk/changelog
index 53e3678c..a36d00d6 100644
--- a/debian.trunk/changelog
+++ b/debian.trunk/changelog
@@ -1,4 +1,4 @@
-cloud-init (VERSION~REVNO-0) UNRELEASED; urgency=low
+cloud-init (VERSION~REVNO-1) UNRELEASED; urgency=low
 
   * build
 
diff --git a/debian.trunk/control b/debian.trunk/control
index f2eec1e4..f0dcef6a 100644
--- a/debian.trunk/control
+++ b/debian.trunk/control
@@ -10,7 +10,7 @@ Build-Depends: cdbs,
                pylint,
                python-mocker,
 XS-Python-Version: all
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 
 Package: cloud-init
 Architecture: all
diff --git a/debian.trunk/rules b/debian.trunk/rules
index 19384687..0f79136c 100755
--- a/debian.trunk/rules
+++ b/debian.trunk/rules
@@ -13,7 +13,6 @@ cloud-init-fixups:
 	for x in $(DEB_DESTDIR)/usr/bin/*.py; do mv "$$x" "$${x%.py}"; done
 	install -d $(DEB_DESTDIR)/etc/rsyslog.d
 	cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf
-	ln -sf cloud-init-per $(DEB_DESTDIR)/usr/bin/cloud-init-run-module
 
 # You only need to run this immediately after checking out the package from
 # revision control.
diff --git a/setup.py b/setup.py
index 96f889d8..9ee58b9a 100755
--- a/setup.py
+++ b/setup.py
@@ -70,8 +70,7 @@ setup(name='cloud-init',
       author_email='scott.moser@canonical.com',
       url='http://launchpad.net/cloud-init/',
       packages=find_packages(),
-      scripts=['bin/cloud-init.py',
-               'bin/cloud-init-cfg.py',
+      scripts=['bin/cloud-init',
                'tools/cloud-init-per',
                ],
       data_files=[('/etc/cloud', glob('config/*.cfg')),
diff --git a/tools/bddeb b/tools/bddeb
index 598f71bb..b162b06f 100755
--- a/tools/bddeb
+++ b/tools/bddeb
@@ -8,8 +8,8 @@ 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)
+version=$(awk -F: \
+   '$1 ~ /[0-9][.][0-9]+[.][0-9]+/ { print $1 ; exit(0); }' ChangeLog )
 mkdir "${TEMP_D}/cloud-init"
 otar="$TEMP_D/cloud-init_$version~bzr${revno}.orig.tar.gz"
 tar -czf - ${files} > "$otar"
@@ -25,7 +25,7 @@ debuild "$@"
 #for x in ../*.deb; do
 #   echo wrote ${x##*/}
 #done
-debname="cloud-init_${version}~bzr${revno}-0_all.deb"
+debname="cloud-init_${version}~bzr${revno}-1_all.deb"
 mv "../$debname" "$start"
 link="$start/cloud-init_all.deb"
 echo "wrote $debname"