python3 support.

This gives us functional python3 support.  There are likely
still bugs, but instance boot on openstack is functional now.

LP: #1247132

4 files changed, 17 insertions, 24 deletions

diff --git a/packages/debian/changelog.in b/packages/debian/changelog.in
index e3e94f54..c9affe47 100644
--- a/packages/debian/changelog.in
+++ b/packages/debian/changelog.in
@@ -1,4 +1,4 @@
-## This is a cheetah template
+## template:basic
 cloud-init (${version}~bzr${revision}-1) UNRELEASED; urgency=low
 
   * build
diff --git a/packages/debian/control.in b/packages/debian/control.in
index 9207e5f4..bd6e3867 100644
--- a/packages/debian/control.in
+++ b/packages/debian/control.in
@@ -1,4 +1,4 @@
-## This is a cheetah template
+## template:basic
 Source: cloud-init
 Section: admin
 Priority: optional
@@ -6,31 +6,22 @@ Maintainer: Scott Moser <smoser@ubuntu.com>
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               python (>= 2.6.6-3~),
-               python-nose,
                pyflakes,
-               python-setuptools,
-               python-selinux,
-               python-cheetah,
-               python-mocker,
-               python-httpretty,
-#for $r in $requires
-               ${r},
-#end for
+               ${python},
+               ${test_requires},
+               ${requires}
 XS-Python-Version: all
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 
 Package: cloud-init
 Architecture: all
 Depends: procps,
-         python,
-#for $r in $requires
-         ${r},
-#end for
-         python-software-properties | software-properties-common,
-         \${misc:Depends},
+         ${python},
+         ${requires},
+         software-properties-common,
+         ${misc:Depends},
 Recommends: sudo
-XB-Python-Version: \${python:Versions}
+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/copyright b/packages/debian/copyright
index f55bb7a3..c694f30d 100644
--- a/packages/debian/copyright
+++ b/packages/debian/copyright
@@ -5,7 +5,7 @@ Source: https://launchpad.net/cloud-init
 
 This package was debianized by Soren Hansen <soren@ubuntu.com> on
 Thu, 04 Sep 2008 12:49:15 +0200 as ec2-init.  It was later renamed to
-cloud-utils by Scott Moser <scott.moser@canonical.com>
+cloud-init by Scott Moser <scott.moser@canonical.com>
 
 Upstream Author: Scott Moser <smoser@canonical.com>
     Soren Hansen <soren@canonical.com>
diff --git a/packages/debian/rules b/packages/debian/rules.in
index 9e0c5ddb..bb2e1d5c 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules.in
@@ -1,10 +1,12 @@
+## template:basic
 #!/usr/bin/make -f
 
 INIT_SYSTEM ?= upstart,systemd
+PYVER ?= python${pyver}
 export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
 
 %:
-	dh $@ --with python2,systemd --buildsystem pybuild
+	dh $@ --with $(PYVER),systemd --buildsystem pybuild
 
 override_dh_install:
 	dh_install
@@ -12,6 +14,6 @@ override_dh_install:
 	cp tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
 
 override_dh_auto_test:
-	# Becuase setup tools didn't copy data...
-	cp -r tests/data .pybuild/pythonX.Y_2.7/build/tests
+	# Because setup tools didn't copy data...
+	[ ! -d .pybuild/pythonX.Y_?.?/build/tests ] || cp -r tests/data .pybuild/pythonX.Y_?.?/build/tests
 	http_proxy= dh_auto_test -- --test-nose