From 2188dc71be86b6c22d2c5522fb7ce41dee566903 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Fri, 5 Aug 2016 16:57:38 -0400
Subject: add debian directory from current yakkety

---
 debian/rules | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 debian/rules

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..4008d73f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+INIT_SYSTEM ?= upstart,systemd
+export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
+
+%:
+	dh $@ --with python3,systemd --buildsystem pybuild
+
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	http_proxy= make PYVER=3 check
+else
+	@echo check disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)
+endif
+
+override_dh_systemd_start:
+	dh_systemd_start --no-restart-on-upgrade --no-start
-- 
cgit v1.2.3


From d0824effd2e48b1d7e0e58ebc85049b86bb6ceca Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Fri, 5 Aug 2016 17:04:26 -0400
Subject: debian/rules: fix PYVER in environment to sync with upstream changes.

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 4008d73f..4bf66d90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	http_proxy= make PYVER=3 check
+	http_proxy= make PYVER=python3 check
 else
 	@echo check disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)
 endif
-- 
cgit v1.2.3


From 99d2da48a2469c870e61e1a5b2c67bdd5d69092b Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Fri, 19 Aug 2016 12:07:34 -0400
Subject: debian/rules, debian/cloud-init.install: remove install file

Remove the install file and use --destdir=debian/cloud-init.
This means we no longer have to maintain debian/cluod-init.install
and risk missing some files.

One such error occurred with the upstream Azure change that added
dchlient-hooks, that were then not picked up by the cloud-init package
here.

LP: #1615745
---
 debian/cloud-init.install | 11 -----------
 debian/rules              |  5 +++++
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 debian/cloud-init.install

(limited to 'debian/rules')

diff --git a/debian/cloud-init.install b/debian/cloud-init.install
deleted file mode 100644
index d985f51e..00000000
--- a/debian/cloud-init.install
+++ /dev/null
@@ -1,11 +0,0 @@
-./tools/21-cloudinit.conf etc/rsyslog.d/
-./tools/Z99-cloud-locale-test.sh etc/profile.d/
-etc/cloud
-etc/init/*.conf
-lib/systemd/*
-lib/udev/*
-usr/bin
-usr/lib/cloud-init
-usr/lib/python*/*-packages/*egg-info
-usr/lib/python*/*-packages/cloudinit
-usr/share/doc/cloud-init
diff --git a/debian/rules b/debian/rules
index 4bf66d90..ef13251f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,8 @@ endif
 
 override_dh_systemd_start:
 	dh_systemd_start --no-restart-on-upgrade --no-start
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/cloud-init
+	install -D ./tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
+	install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh
-- 
cgit v1.2.3