Get the new builddeb working and fix the rules file

2 files changed, 13 insertions, 3 deletions

diff --git a/packages/bddeb b/packages/bddeb
index f2158d5b..1a9f13f3 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -15,7 +15,8 @@ def tmpdir():
     try:
         yield t
     finally:
-        shutil.rmtree(t)
+        pass
+        #shutil.rmtree(t)
 
 
 def join(*paths):
@@ -56,6 +57,10 @@ def archive_code():
 
 def main():
 
+    # cmd = ['apt-get', 'install', 'python-nose',
+    #'pyflakes', 'python-mocker', 'cdbs', 'debhelper']
+    # tiny_p(cmd)
+
     with tmpdir() as td:
         (revno, version, bname, archive_fn) = archive_code()
         real_archive_fn = os.path.join(td, os.path.basename(archive_fn))
@@ -68,12 +73,18 @@ def main():
         edir = join(td, bname)
         shutil.move(edir, join(td, 'cloud-init'))
         shutil.copytree('debian.trunk', join(td, 'cloud-init', 'debian'))
-
+        
         cmd = ['sed', '-i', '-e',"s,VERSION,%s," %(version),
                '-e', "s,REVNO,bzr%s," % (revno),
                join(td, 'cloud-init', 'debian', 'changelog')]
         tiny_p(cmd)
         
+        # Seems to want an original tar ball
+        o_tar = "cloud-init_%s~bzr%s.orig.tar.gz" % (version, revno)
+        cmd = ['tar', '-czf', join(td, o_tar), '-C', join(td, 'cloud-init')]
+        cmd.extend(os.listdir(join(td, 'cloud-init')))
+        tiny_p(cmd)
+        
         ocwd = os.getcwd()
         os.chdir(join(td, 'cloud-init'))
         cmd = ['debuild']
diff --git a/packages/debian.trunk/rules b/packages/debian.trunk/rules
index 0f79136c..a907b594 100755
--- a/packages/debian.trunk/rules
+++ b/packages/debian.trunk/rules
@@ -10,7 +10,6 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 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