Import version 0.7.7~bzr1176-0ubuntu1

Imported using git-dsc-commit.

7 files changed, 127 insertions, 21 deletions

diff --git a/debian/README.source b/debian/README.source
index ecf0bad0..5e4319fb 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -38,17 +38,6 @@ There is a utility in debian/cherry-pick-rev that will
 help to cherry pick a single commit from trunk.
 
 == New snapshot ==
-To import a new snapshot, do:
-
- trunk="../trunk"
- uver=$(cd "$trunk" && ./tools/read-version) # the *next* upstream version
- revno=$(cd "$trunk" && bzr revno)
- pversion=$(dpkg-parsechangelog --show-field Version) 
- prevno=$(echo "$pversion" | sed 's,.*bzr\([0-9]\+\)-.*,\1,')
- version=${uver}~bzr${revno}
- tarball=cloud-init-${version}.tar.gz
- bzr export --format=tgz --revision=${revno} "$tarball" "${trunk}"
- t=../cloud-init_${version}.orig.tar.gz && [ -f $t ] && tarball=$t
- [ -f "$t" ] || bzr export --format=tgz --revision=${revno} "$tarball" "${trunk}"
- bzr merge-upstream "$tarball" --version=${version}
- ( cd "$trunk" && bzr log -r $(($prevno+1)).. ) > new-changes.log
+To pull a new upstream snapshot, given lp:cloud-init in ../trunk:
+
+ ./debian/new-upstream-snapshot ../trunk
diff --git a/debian/changelog b/debian/changelog
index 98c1583e..57b75266 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+cloud-init (0.7.7~bzr1176-0ubuntu1) xenial; urgency=medium
+
+  * d/README.source, d/new-upstream-snapshot: simplify the README.source
+    with a script.
+  * d/rules: support DEB_BUILD_OPTIONS=nocheck and remove unused code.
+  * d/rules: make tests with python3
+  * d/control: add pep8 as a build depends
+  * d/cloud-init.preinst, d/cloud-init.postinst adjust upgrade path
+    to adjust systemd jobs that put cloud-init unit jobs directly
+    in multi-user.target.
+  * New upstream snapshot.
+    * Add Image Customization Parser for VMware vSphere Hypervisor Support.
+      Disabled by default. [Sankar Tanguturi]
+    * lxd: add initial support for setting up lxd using 'lxd init'
+    * Handle escaped quotes in WALinuxAgentShim.find_endpoint (LP: #1488891)
+    * timezone: use a symlink when updating /etc/localtime (LP: #1543025)
+    * enable more code testing in 'make check'
+    * Added Bigstep datasource [Daniel Watkins]
+    * Enable password changing via a hashed string [Alex Sirbu]
+
+ -- Scott Moser <smoser@ubuntu.com>  Fri, 04 Mar 2016 15:44:02 -0500
+
 cloud-init (0.7.7~bzr1160-0ubuntu1) xenial; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst
index 90277be0..cfcd4528 100644
--- a/debian/cloud-init.postinst
+++ b/debian/cloud-init.postinst
@@ -193,6 +193,14 @@ fix_1336855() {
 
 }
 
+cleanup_lp1552999() {
+    local oldver="$1" last_bad_ver="0.7.7~bzr1178"
+    dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
+    local edir="/etc/systemd/system/multi-user.target.wants"
+    rm -f "$edir/cloud-config.service" "$edir/cloud-final.service" \
+        "$edir/cloud-init-local.service" "$edir/cloud-init.service"
+}
+
 if [ "$1" = "configure" ]; then
    # disable ureadahead (LP: #499520)
    dpkg-divert --package cloud-init --rename --divert \
@@ -236,3 +244,8 @@ EOF
 fi
 
 #DEBHELPER#
+
+if [ "$1" = "configure" ]; then
+   oldver="$2"
+   cleanup_lp1552999 "$oldver"
+fi
diff --git a/debian/cloud-init.preinst b/debian/cloud-init.preinst
index e383c092..c8406e31 100644
--- a/debian/cloud-init.preinst
+++ b/debian/cloud-init.preinst
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 
-#DEBHELPER#
 # Remove a no-longer used conffile
 rm_conffile() {
 	local PKGNAME="$1"
@@ -172,6 +171,16 @@ EOM
 fi
 }
 
+cleanup_lp1552999() {
+    local oldver="$1" last_bad_ver="0.7.7~bzr1178"
+    dpkg --compare-versions "$oldver" le "$last_bad_ver" || return 0
+    local hdir="/var/lib/systemd/deb-systemd-helper-enabled"
+    hdir="$hdir/multi-user.target.wants" 
+    local edir="/etc/systemd/system/multi-user.target.wants"
+    rm -f "$hdir/cloud-config.service" "$hdir/cloud-final.service" \
+        "$hdir/cloud-init-local.service" "$hdir/cloud-init.service"
+}
+
 case "$1" in
 	install|upgrade)
 		# removing obsolete conffiles from the 'ec2-init' package
@@ -238,4 +247,8 @@ case "$1" in
          [ -d "${d}/cloud.cfg.d" ] || mkdir "${d}/cloud.cfg.d"
          mv "$d/distro.cfg" "$d/cloud.cfg.d/90_dpkg.cfg"
       fi
+
+      cleanup_lp1552999 "$oldver"
 esac
+
+#DEBHELPER#
diff --git a/debian/control b/debian/control
index 8a67e9ed..f6bcd2d7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
                iproute2,
+               pep8,
                po-debconf,
                pyflakes,
                python3,
diff --git a/debian/new-upstream-snapshot b/debian/new-upstream-snapshot
new file mode 100755
index 00000000..5f586749
--- /dev/null
+++ b/debian/new-upstream-snapshot
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+Usage() {
+   cat <<EOF
+Usage: ${0##*/} trunk-dir [next-upstream-version]
+
+   pull in new upstream snapshot from trunk-dir
+
+   Leaves file 'new-changes.log'
+
+   Example:
+   $ ${0##*/} ../trunk
+     # prepare bzr dir in . with new snapshot from ../trunk
+   $ dch --edit
+     # read changes in new-changes.log and write changelog
+   $ debcommit
+   $ dch --release
+   $ debcommit --release
+EOF
+}
+fail() { echo "$@" 1>&2; exit 1; }
+
+name="cloud-init"
+[ $# -eq 0 ] && { Usage 1>&2; exit 1; }
+[ "$1" = "-h" -o "$1" = "--help" ] && { Usage; exit 0; }
+trunk=$1
+revno=${2:-tip}
+uver=${2:-0.7.7} # the *next* upstream version
+
+[ -d "$trunk" ] ||
+   fail "trunk dir '$trunk' not a dir"
+if [ "$revno" = "tip" ]; then
+   revno=$(cd "$trunk" && bzr revno) ||
+      fail "failed getting bzr revno from $trunk"
+fi
+pversion=$(dpkg-parsechangelog --show-field Version) ||
+   fail "failed to read previous version with dpkg-parsechangelog"
+prevno=$(echo "$pversion" | sed 's,.*bzr\([0-9]\+\)-.*,\1,') ||
+   fail "fail reading previous bzr revision from previous version '$pversion'"
+version=${uver}~bzr${revno}
+tarball=${name}-${version}.tar.gz
+t=../${name}_${version}.orig.tar.gz
+if [ -f "$t" ]; then
+   echo "using '$t' as tarball" 1>&2
+   tarball="$t"
+else
+   echo "creating $tarball with bzr export" 1>&2
+   bzr export --format=tgz "--revision=${revno}" "$tarball" "${trunk}" ||
+     fail "failed exporting bzr in $trunk to $tarball"
+fi
+bzr merge-upstream "$tarball" "--version=${version}" ||
+   fail "failed merge-upstream of $tarball at version=$version"
+
+oldrev=$(($prevno+1))
+( cd "$trunk" && bzr log -r "${oldrev}..${revno}" ) > new-changes.log ||
+   fail "failed to get changes from ${oldrev}..$revno"
+
+cat <<EOF
+====
+Now see ./new-changes.log for changes between $oldrev and $revno
+
+then:
+   $ dch --edit
+     # read changes in new-changes.log and write changelog
+   $ debcommit
+   $ dch --release
+   $ debcommit --release
+   $ debuild -S
+EOF
diff --git a/debian/rules b/debian/rules
index d83f102d..4008d73f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,11 @@ export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
 	dh $@ --with python3,systemd --buildsystem pybuild
 
 override_dh_auto_test:
-	# Because setup tools didn't copy data...
-	[ ! -d .pybuild/pythonX.Y_?.?/build/tests ] || cp -r tests/data .pybuild/pythonX.Y_?.?/build/tests
-	# We set http_proxy because of httpretty issue 122 trunk has worked
-	# around that but to support cloud-init that has not.
-	http_proxy= dh_auto_test -- --test-nose
+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
-