UBUNTU: [Config] make linux-tools-common and linux-cloud-tools-common provide linux...

We incorrectly have been producing linux-gke-tools-common and
linux-gke-cloud-tools-common packages with conflicting contents to our own.
This is wrong.  Make our packages Provides: their linux-gke equivalents to
allow us to replace them without change to the existing linux-tools-gke
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@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Marcelo Cerri <marcelo.cerri@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index d15e2a66188265a0bbc94af6ee1669ea47ac30f9..753a1d76bc6aafa549b427e2109105b7d564f877 100644 (file)
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -116,6 +116,12 @@ Architecture: all
 Multi-Arch: foreign
 Section: kernel
 Priority: optional
+Provides:
+ linux-gke-tools-common,
+Conflicts:
+ linux-gke-tools-common,
+Replaces:
+ linux-gke-tools-common,
 Depends: ${misc:Depends}, lsb-release
 Description: Linux kernel version specific tools for version PKGVER
  This package provides the architecture independent parts for kernel
@@ -141,6 +147,14 @@ Architecture: all
 Multi-Arch: foreign
 Section: kernel
 Priority: optional
+Breaks:
+ linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
+Replaces:
+ linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
+Conflicts:
+ linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
+Provides:
+ linux-gke-cloud-tools-common,
 Depends: ${misc:Depends}
 Description: Linux kernel version specific cloud tools for version PKGVER
  This package provides the architecture independent parts for kernel