From 655fb09c16cfa164fb4f47c0107c1d6fece36e96 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 11 Jul 2013 17:31:05 -0400 Subject: Import patches-unapplied version 1.3.2-0ubuntu3 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 6cf5a13dd65bc0abf70a3874f11d5b61b26dce2b New changelog entries: [ Ben Howard ] * debian/patches/config_for_cloud-init.patch: Modified configuration to disable provisioning functions. walinuxagent for Ubuntu should now be used with Cloud-init. * debian/postinst: Don't overwrite existing /etc/waagent.conf agent configuration on install or upgrade. * debian/upstart: start later in boot, avoiding race conditions with cloud-init. [ Scott Moser ] * debian: wrap and sort directory * debian/patches/no_udev_rule_removal.patch: remove 000 prefix in file name. No need for numbering in filenames when we have patches/series. --- debian/control | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index a49d3d0..7d2ac0f 100644 --- a/debian/control +++ b/debian/control @@ -9,14 +9,15 @@ XS-Python-Version: all Homepage: http://go.microsoft.com/fwlink/?LinkId=250998 Package: walinuxagent -Architecture: i386 amd64 +Architecture: amd64 i386 Pre-Depends: walinuxagent-data-saver (= ${binary:Version}) -Depends: python (>= 2.4), - openssl (>=1.0), +Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2), + linux-image-extra-virtual, openssh-server (>=1:5.9p1), + openssl (>=1.0), passwd (>=4.1.4.2), + python (>= 2.4), util-linux (>=2.0), - linux-image-extra-virtual, ${misc:Depends}, ${python:Depends} Conflicts: network-manager @@ -26,7 +27,7 @@ Description: Windows Azure Linux Agent disk images that are built to run in the Windows Azure environment. Package: walinuxagent-data-saver -Architecture: i386 amd64 +Architecture: amd64 i386 Depends: ${misc:Depends} Description: Helper package which ensures safe upgrade for walinuxagent Early versions of walinuxagent contained a bug the deleted configuration and -- cgit v1.2.3