Import patches-applied version 2.2.6-0ubuntu1 to applied/ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: dd73af563850762aad64e7ed2a9897377830af10
Unapplied parent: 2bc77af05fe602a2ba92569428c6006d1aebd19f

New changelog entries:
  * 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).

1 files changed, 2 insertions, 9 deletions

diff --git a/makepkg.py b/makepkg.py
index 9796ce3..52e0eae 100755
--- a/makepkg.py
+++ b/makepkg.py
@@ -42,7 +42,7 @@ PUBLISH_MANIFEST = '''<?xml version="1.0" encoding="utf-8" ?>
   <IsJsonExtension>true</IsJsonExtension>
   <CompanyName>Microsoft</CompanyName>
   <SupportedOS>Linux</SupportedOS>
-  <Regions>{2}</Regions>
+  <!--%REGIONS%-->
 </ExtensionImage>
 '''
 
@@ -60,12 +60,6 @@ family = 'Test'
 if len(sys.argv) > 1:
     family = sys.argv[1]
 
-region = 'South Central US'
-if len(sys.argv) > 2:
-    cloud = sys.argv[2]
-    if cloud == 'BlackForest':
-        region = 'Germany Central'
-
 def do(*args):
     try:
         subprocess.check_output(args, stderr=subprocess.STDOUT)
@@ -100,8 +94,7 @@ with open(manifest_path, mode='w') as manifest:
 print("Writing {0}".format(publish_manifest_path))
 with open(publish_manifest_path, mode='w') as publish_manifest:
     publish_manifest.write(PUBLISH_MANIFEST.format(AGENT_VERSION,
-                                                   family,
-                                                   region))
+                                                   family))
 
 
 cwd = os.getcwd()