11 files changed, 38 insertions, 61 deletions
diff --git a/debian/changelog b/debian/changelog
index 23edeff..d9ee595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+walinuxagent (2.2.6-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release (LP: #1661750).
+  * debian/control:
+    - Change the maintainer to Ubuntu Developers (LP: #1657528).
+    - Add the dependency of isc-dhcp-client as our maintainer scripts assume
+      it's installed.
+    - Add trailing commas to dependencies, add whitespaces.
+  * Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error).
+  * debian/docs:
+    - Remove LICENSE.txt as it's redundant.
+  * debian/postinst:
+    - Stop checking for update-initramfs existence using the absolute path, use
+      the 'command' command instead to make lintian happy.
+  * Remove debian/patches/disable-auto-update.patch:
+    - We now ship with auto-updates enabled (LP: #1650522).
+  * debian/maintscript:
+    - Add a maintscript to rename the old logrotate file on upgrade from an
+      ancient version of walinuxagent (LP: #1673152).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 15 Mar 2017 10:19:34 +0100
+
 walinuxagent (2.2.2-0ubuntu1) zesty; urgency=medium
 
   * New upstream release (LP: #1651128)
diff --git a/debian/control b/debian/control
index 3c631b1..1de6278 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,28 @@
 Source: walinuxagent
 Section: python
 Priority: extra
-Maintainer: Ben Howard <ben.howard@ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Microsoft Corporation <walinuxagent@microsoft.com>
 Build-Depends: debhelper (>= 8),
                dh-systemd,
                python3-all,
                python3-setuptools,
                python3-pyasn1,
-               openssl (>=1.0)
-Standards-Version: 3.9.7
+               openssl (>= 1.0),
+Standards-Version: 3.9.8
 X-Python3-Version: >= 3.2
 Homepage: http://go.microsoft.com/fwlink/?LinkId=250998
 
 Package: walinuxagent
 Architecture: amd64
-Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2),
-         openssh-server (>=1:5.9p1),
-         openssl (>=1.0),
-         passwd (>=4.1.4.2),
-         util-linux (>=2.0),
+Depends: cloud-init (>= 0.7.3~bzr826-0ubuntu2),
+         isc-dhcp-client,
+         openssh-server (>= 1:5.9p1),
+         openssl (>= 1.0),
+         passwd (>= 4.1.4.2),
+         util-linux (>= 2.0),
          ${misc:Depends},
-         ${python3:Depends}
+         ${python3:Depends},
 Recommends: linux-image-extra-virtual
 Description: Windows Azure Linux Agent
  The Windows Azure Linux Agent supports the provisioning and running of Linux
diff --git a/debian/docs b/debian/docs
index ffb38b3..ae1ac0d 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,5 @@
 debian/99-cloud-init-disable-diskprovisioning.conf
 NOTICE
-LICENSE.txt
 README.md
 MANIFEST
 Changelog
diff --git a/debian/ephemeral-disk-warning.sh b/debian/ephemeral-disk-warning
index d497256..d497256 100755
--- a/debian/ephemeral-disk-warning.sh
+++ b/debian/ephemeral-disk-warning
diff --git a/debian/ephemeral-disk-warning.service b/debian/ephemeral-disk-warning.service
index 294ac2a..8751bf6 100644
--- a/debian/ephemeral-disk-warning.service
+++ b/debian/ephemeral-disk-warning.service
@@ -7,7 +7,7 @@ ConditionPathExists=/dev/disk/azure/resource-part1
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/ephemeral-disk-warning.sh
+ExecStart=/usr/sbin/ephemeral-disk-warning
 RemainAfterExit=yes
 StandardOutput=journal+console
 
diff --git a/debian/install b/debian/install
index 1406e8d..4e43dae 100644
--- a/debian/install
+++ b/debian/install
@@ -2,7 +2,7 @@ config/91_walinuxagent.cfg etc/cloud/cloud.cfg.d
 config/66-azure-storage.rules lib/udev/rules.d
 debian/ephemeral-disk-warning.service lib/systemd/system
 debian/ephemeral-disk-warning.conf etc/init
-debian/ephemeral-disk-warning.sh usr/sbin
+debian/ephemeral-disk-warning usr/sbin
 debian/67-azure-console.rules lib/udev/rules.d
 debian/68-azure-nm-unmanaged.rules lib/udev/rules.d
 debian/azure-resource usr/share/initramfs-tools/hooks
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..8d0fda7
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1 @@
+mv_conffile /etc/logrotate.d/waagent /etc/logrotate.d/waagent.logrotate 2.2.6~
diff --git a/debian/patches/disable-auto-update.patch b/debian/patches/disable-auto-update.patch
deleted file mode 100644
index 75e1d6b..0000000
--- a/debian/patches/disable-auto-update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: walinuxagent-2.2.2/config/ubuntu/waagent.conf
-===================================================================
---- walinuxagent-2.2.2.orig/config/ubuntu/waagent.conf
-+++ walinuxagent-2.2.2/config/ubuntu/waagent.conf
-@@ -74,7 +74,7 @@ OS.OpensslPath=None
- # OS.EnableRDMA=y
- 
- # Enable or disable goal state processing auto-update, default is enabled
--# AutoUpdate.Enabled=y
-+AutoUpdate.Enabled=n
- 
- # Determine the update family, this should not be changed
- # AutoUpdate.GAFamily=Prod
diff --git a/debian/patches/fix-waagent-service.patch b/debian/patches/fix-waagent-service.patch
deleted file mode 100644
index b00ccb0..0000000
--- a/debian/patches/fix-waagent-service.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/distro/systemd/waagent.service
-+++ /dev/null
-@@ -1,13 +0,0 @@
--[Unit]
--Description=Windows Azure Linux Agent
--After=network.target
--After=sshd.service
--ConditionFileIsExecutable=/usr/sbin/waagent
--ConditionPathExists=/etc/waagent.conf
--
--[Service]
--Type=simple
--ExecStart=/usr/sbin/waagent -daemon
--
--[Install]
--WantedBy=multi-user.target
---- /dev/null
-+++ b/distro/systemd/walinuxagent.service
-@@ -0,0 +1,14 @@
-+[Unit]
-+Description=Windows Azure Linux Agent
-+After=network-online.target cloud-final.service
-+Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service
-+ConditionFileIsExecutable=/usr/sbin/waagent
-+ConditionPathExists=/etc/waagent.conf
-+ConditionVirtualization=microsoft
-+
-+[Service]
-+Type=simple
-+ExecStart=/usr/sbin/waagent -daemon
-+
-+[Install]
-+WantedBy=multi-user.target
diff --git a/debian/patches/series b/debian/patches/series
index 452e72a..05993c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-disable-auto-update.patch
 cloud-init-default-cfg.patch
 disable_import_test.patch
 disable_udev_overrides.patch
diff --git a/debian/postinst b/debian/postinst
index 759c856..2f2064d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,9 +6,10 @@ if [ "$1" = "configure" ]; then
     sed -i 's|^send host-name "<hostname>";|send host-name = gethostname();|g' /etc/dhcp/dhclient.conf
 
     # Trigger update for initramfs (LP: #1514485).
-    [ -x /usr/sbin/update-initramfs ] && update-initramfs -u
+    command -v update-initramfs >/dev/null 2>&1 && update-initramfs -u
     [ -x /etc/kernel/postinst.d/dracut ] && /etc/kernel/postinst.d/dracut $(uname -r)
-
 fi
 
 #DEBHELPER#
+
+exit 0