Import patches-applied version 1.1-0ubuntu2 to applied/ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 074820494a3cc1c70be94a549495ca6dfcb843cc
Unapplied parent: fabf71da7725fc3131e043e1c66712018b038f9e

New changelog entries:
  * Stop upgrades purging walinuxagent meta-data and configuration files
    (LP: #1079897):
    - d/{control,walinuxagent-data-saver.preinst}: Added
      walinuxagent-data-saver package to ensure that agent generated data is
      not lost on upgrade by diverting /usr/sbin/waagent during the upgrade
      process.
    - d/walinuxagent-data-saver.lintian-overrides: Override errors about use
      of dpkg-divert in this package.
    - d/control: Added Pre-Depends to walinuxagent on walinuxagent-data-saver.
    - d/prerm: Stop calling waagent --uninstall during reconfiguration
      and upgrade, specify files to remove manually for purge.
    - d/postinst: Remove divert of /usr/sbin/waagent prior to completion of
      package install.
  * d/preinst: If upgrading from package version with unmanaged waagent upstart
    configuration stop the agent and remove the upstart configuration.
  * d/upstart: Tidied description in upstart job.

1 files changed, 10 insertions, 0 deletions

diff --git a/debian/control b/debian/control
index 2fc595d..a49d3d0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Homepage: http://go.microsoft.com/fwlink/?LinkId=250998
 
 Package: walinuxagent
 Architecture: i386 amd64
+Pre-Depends: walinuxagent-data-saver (= ${binary:Version})
 Depends: python (>= 2.4),
          openssl (>=1.0),
          openssh-server (>=1:5.9p1),
@@ -23,3 +24,12 @@ Description: Windows Azure Linux Agent
  The Windows Azure Linux Agent supports the provisioning and running of Linux
  VMs in the Windows Azure cloud. This package should be installed on Linux
  disk images that are built to run in the Windows Azure environment.
+
+Package: walinuxagent-data-saver
+Architecture: i386 amd64
+Depends: ${misc:Depends}
+Description: Helper package which ensures safe upgrade for walinuxagent
+ Early versions of walinuxagent contained a bug the deleted configuration and
+ data on reconfiguration or upgrade.
+ .
+ This package is used to ensure safe upgrades.