[xenial/master-next 2/3] UBUNTU: [Config] make linux-tools-common and linux-cloud-tools-common provide linux-aws versions

[Andy Whitcroft]

We incorrectly have been producing linux-aws-tools-common and
linux-aws-cloud-tools-common packages with conflicting contents to our own.
This is wrong.  Make our packages Provides: their linux-aws equivalents to
allow us to replace them without change to the existing linux-tools-aws
packages.  Conflicts:/Replaces: on the existing packages to ensure they
are removed before we are updated.

BugLink: http://bugs.launchpad.net/bugs/1688579
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.master/control.stub.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 753a1d76bc6a..677852cc718b 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -117,10 +117,13 @@ Multi-Arch: foreign
 Section: kernel
 Priority: optional
 Provides:
+ linux-aws-tools-common,
  linux-gke-tools-common,
 Conflicts:
+ linux-aws-tools-common,
  linux-gke-tools-common,
 Replaces:
+ linux-aws-tools-common,
  linux-gke-tools-common,
 Depends: ${misc:Depends}, lsb-release
 Description: Linux kernel version specific tools for version PKGVER
@@ -148,12 +151,16 @@ Multi-Arch: foreign
 Section: kernel
 Priority: optional
 Breaks:
+ linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
  linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
 Replaces:
+ linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
  linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
 Conflicts:
+ linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
  linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
 Provides:
+ linux-aws-cloud-tools-common,
  linux-gke-cloud-tools-common,
 Depends: ${misc:Depends}
 Description: Linux kernel version specific cloud tools for version PKGVER
-- 
2.11.0