[focal/oem-5.6/oem-5.10 1/1] UBUNTU: [Packaging] express oem flavour explicitly

[Andy Whitcroft]

BugLink: https://bugs.launchpad.net/bugs/1905013
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian/control.d/oem | 10 +++++-----
 debian/variants      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control.d/oem b/debian/control.d/oem
index 467e049..1c4e2de 100644
--- a/debian/control.d/oem
+++ b/debian/control.d/oem
@@ -1,4 +1,4 @@
-Package: linux-headers${variant:suffix}
+Package: linux-headers-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides-headers}
@@ -7,7 +7,7 @@ Description: OEM Linux kernel headers
  This package will always depend on the latest OEM kernel headers
  available.
 
-Package: linux-image${variant:suffix}
+Package: linux-image-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: ${variant:provides-image} ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules}
@@ -17,7 +17,7 @@ Description: OEM Linux kernel image
  This package will always depend on the latest OEM kernel image
  available.
 
-Package: linux-tools${variant:suffix}
+Package: linux-tools-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides: linux-tools
@@ -26,11 +26,11 @@ Description: OEM Linux kernel tools
  This package will always depend on the latest OEM kernel tools
  available.
 
-Package: linux${variant:suffix}
+Package: linux-oem${variant:suffix}
 Architecture: amd64
 Section: kernel
 Provides:  ${test:provides-full-oem} ${test:provides-full-preferred} ${variant:provides}
-Depends: ${misc:Depends}, linux-image${variant:suffix} (= ${binary:Version}), linux-headers${variant:suffix} (= ${binary:Version})
+Depends: ${misc:Depends}, linux-image-oem${variant:suffix} (= ${binary:Version}), linux-headers-oem${variant:suffix} (= ${binary:Version})
 Description: Complete OEM Linux kernel and headers
  This package will always depend on the latest complete OEM Linux kernel
  and headers.
diff --git a/debian/variants b/debian/variants
index 7edabe1..a5f9f8e 100644
--- a/debian/variants
+++ b/debian/variants
@@ -1 +1 @@
--oem-20.04-edge
+-20.04-edge
-- 
2.27.0