Import patches-unapplied version 2.0.13-0ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 5af8d1f80caf5d49988dbb0cf95ad7c58250b90f

New changelog entries:
  * New upstream release (LP: #1449369).
  * Rebased patches for 2.0.12 onto 2.0.13.

6 files changed, 33 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index c4dddd5..87408ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+walinuxagent (2.0.13-0ubuntu1) wily; urgency=medium
+
+  * New upstream release (LP: #1449369).
+  * Rebased patches for 2.0.12 onto 2.0.13.
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Thu, 02 Jul 2015 15:14:26 -0600
+
 walinuxagent (2.0.12-0ubuntu2) vivid; urgency=medium
 
   * Fixed systemd unit file which caused SharedConfig.xml to be deleted by
diff --git a/debian/control b/debian/control
index a167101..226c96f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Ben Howard <ben.howard@ubuntu.com>
 XSBC-Original-Maintainer: Microsoft Corporation <walinuxagent@microsoft.com>
 Build-Depends: debhelper (>= 8), python-all, python-setuptools, dh-systemd, dh-python
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 XS-Python-Version: all
 Homepage: http://go.microsoft.com/fwlink/?LinkId=250998
 
diff --git a/debian/patches/build_info.txt b/debian/patches/build_info.txt
new file mode 100644
index 0000000..f02ab12
--- /dev/null
+++ b/debian/patches/build_info.txt
@@ -0,0 +1,4 @@
+serial=20150629
+orig_prefix=trusty-server-cloudimg
+suite=trusty
+build_name=server
diff --git a/debian/patches/disable_provisioning.patch b/debian/patches/disable_provisioning.patch
index 08d8ee0..956d30b 100644
--- a/debian/patches/disable_provisioning.patch
+++ b/debian/patches/disable_provisioning.patch
@@ -1,6 +1,18 @@
 --- a/config/waagent.conf
 +++ b/config/waagent.conf
-@@ -14,30 +14,34 @@
+@@ -2,6 +2,11 @@
+ # Windows Azure Linux Agent Configuration
+ #
+ 
++# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will
++# unless you disable Cloud-init disk provisioning. Please see
++# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf
++#
++
+ # Specified program is invoked with the argument "Ready" when we report ready status
+ # to the endpoint server.
+ Role.StateConsumer=None
+@@ -14,19 +19,19 @@
  Role.TopologyConsumer=None
  
  # Enable instance creation
@@ -22,6 +34,11 @@
 -Provisioning.MonitorHostName=y
 +Provisioning.MonitorHostName=n
  
+ # Decode CustomData from Base64.
+ Provisioning.DecodeCustomData=n
+@@ -35,14 +40,14 @@
+ Provisioning.ExecuteCustomData=n
+ 
  # Format if unformatted. If 'n', resource disk will not be mounted.
 -ResourceDisk.Format=y
 +ResourceDisk.Format=n
@@ -34,10 +51,5 @@
 -ResourceDisk.MountPoint=/mnt/resource
 +ResourceDisk.MountPoint=/mnt
  
-+# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will
-+# unless you disable Cloud-init disk provisioning. Please see
-+# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf
-+#
  # Create and use swapfile on resource disk.
  ResourceDisk.EnableSwap=n
- 
diff --git a/debian/patches/fixup_setup_file.patch b/debian/patches/fixup_setup_file.patch
index 17a29b9..845607d 100644
--- a/debian/patches/fixup_setup_file.patch
+++ b/debian/patches/fixup_setup_file.patch
@@ -1,6 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -52,7 +52,7 @@
+@@ -51,7 +51,7 @@
  
      def initialize_options(self):
          install.initialize_options(self)
diff --git a/debian/patches/series b/debian/patches/series
index 60e6520..bddf5a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 fixup_setup_file.patch
 cloud-init-default-cfg.patch
-disable_provisioning.patch
+#disable_provisioning.patch
 disable-udev-rules.patch
 fix-waagent-service.patch
+disable_provisioning.patch