Merge lp:~xnox/ubuntu/utopic/cloud-init/simplify-packaging into lp:ubuntu/utopic/cloud-init

[Dimitri John Ledkov]

Ignoring tests for now, as new upstream release is needed.

[lp:~xnox/ubuntu/utopic/cloud-init/simplify-packaging]

341. By Dimitri John Ledkov on 2014-07-24

whitespace

Unmerged revisions

341. By Dimitri John Ledkov on 2014-07-24

whitespace

340. By Dimitri John Ledkov on 2014-07-24

Simplify packaging like upstream

=== modified file 'debian/cloud-init.install'
--- debian/cloud-init.install	2012-04-05 01:24:42 +0000
+++ debian/cloud-init.install	2014-07-24 14:04:05 +0000
@@ -1,9 +1,9 @@
 etc/cloud
 etc/init/*.conf
-etc/profile.d/*
-etc/rsyslog.d/*
 usr/bin
 usr/lib/cloud-init
 usr/lib/python*/*-packages/*egg-info
 usr/lib/python*/*-packages/cloudinit
 usr/share/doc/cloud-init
+./tools/21-cloudinit.conf etc/rsyslog.d/
+./tools/Z99-cloud-locale-test.sh etc/profile.d

=== modified file 'debian/compat'
--- debian/compat	2010-02-04 03:00:05 +0000
+++ debian/compat	2014-07-24 14:04:05 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/grub-legacy-ec2.install'
--- debian/grub-legacy-ec2.install	2011-10-06 17:11:29 +0000
+++ debian/grub-legacy-ec2.install	2014-07-24 14:04:05 +0000
@@ -1,5 +1,4 @@
-etc/kernel/postinst.d/x-grub-legacy-ec2
-etc/kernel/postrm.d/x-grub-legacy-ec2
-usr/sbin/grub-set-default
-usr/sbin/grub-set-default-legacy-ec2
-usr/sbin/update-grub-legacy-ec2
+debian/update-grub-legacy-ec2 usr/sbin
+debian/grub-set-default-legacy-ec2 usr/sbin
+debian/grub-set-default usr/sbin
+debian/kernel etc/kernel/

=== added directory 'debian/kernel'
=== added directory 'debian/kernel/postinst.d'
=== renamed file 'debian/grub-legacy-ec2.kernel-postinst' => 'debian/kernel/postinst.d/x-grub-legacy-ec2'
=== added directory 'debian/kernel/postrm.d'
=== renamed file 'debian/grub-legacy-ec2.kernel-postrm' => 'debian/kernel/postrm.d/x-grub-legacy-ec2'
=== removed file 'debian/pycompat'
--- debian/pycompat	2010-02-04 03:00:05 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/rules'
--- debian/rules	2013-04-11 12:55:51 +0000
+++ debian/rules	2014-07-24 14:04:05 +0000
@@ -1,31 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON2_MODULE_PACKAGES = cloud-init
-
-binary-install/cloud-init::cloud-init-fixups
-
-binary-install/grub-legacy-ec2::grub-legacy-ec2-install
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_PYTHON_INSTALL_ARGS_ALL += --init-system=upstart
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-
-cloud-init-fixups:
-	install -d $(DEB_DESTDIR)/etc/rsyslog.d $(DEB_DESTDIR)/etc/profile.d
-	cp tools/21-cloudinit.conf $(DEB_DESTDIR)/etc/rsyslog.d/21-cloudinit.conf
-	cp tools/Z99-cloud-locale-test.sh $(DEB_DESTDIR)/etc/profile.d
-
-grub-legacy-ec2-install:
-	install -d $(DEB_DESTDIR)/usr/sbin
-	install -m 0755 debian/update-grub-legacy-ec2 $(DEB_DESTDIR)/usr/sbin
-	# Note: these are installed as 'x-' so as to be
-	# sure to run after 'initramfs-tools' so the ramdisk
-	# will be genrated.
-	for khook in postinst postrm; do \
-		d=$(DEB_DESTDIR)/etc/kernel/$${khook}.d; \
-		install -d "$${d}" && \
-		install -m 0755 "debian/grub-legacy-ec2.kernel-$${khook}" "$${d}/x-grub-legacy-ec2" || exit 1; done
-	install -m 0755 debian/grub-set-default-legacy-ec2 $(DEB_DESTDIR)/usr/sbin
-	install -m 0755 debian/grub-set-default $(DEB_DESTDIR)/usr/sbin
+INIT_SYSTEM ?= upstart
+export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
+
+%:
+	dh $@ --with python2,systemd --buildsystem pybuild
+
+override_dh_auto_test:
+	# Becuase setup tools didn't copy data...
+	cp -r tests/data .pybuild/pythonX.Y_2.7/build/tests
+	-http_proxy= dh_auto_test -- --test-nose