Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1863583/obsolete-by-5.4/groovy into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/groovy

[You-Sheng Yang]

* dkms: add OBSOLETE_BY=5.4.0 (LP: #1863583)
* debian: drop modaliases support (LP: #1869587)

[You-Sheng Yang (vicamo)]

PPA for test is in https://launchpad.net/~vicamo/+archive/ubuntu/ppa-1863583 and verified.

[Timo Aaltonen (tjaalton)]

shouldn't it be removed from the archive instead?

[You-Sheng Yang (vicamo)]

Hi, Focal is a LTS like Bionic, and like Bionic we have to maintain it for years and we're almost certainly going to need it again some time later to support new hardware. Unless it's officially dead in the upstream, I would suggest we keep it for now.

[You-Sheng Yang (vicamo)]

review: Approve

[You-Sheng Yang (vicamo)]

8324-0ubuntu2 is now in groovy with modaliases removed, so it won't be pulled automatically from additional drivers from now on.

diff --git a/debian/backport-iwlwifi-dkms.dkms.in b/debian/backport-iwlwifi-dkms.dkms.in
index 285c400..48bc882 100644
--- a/debian/backport-iwlwifi-dkms.dkms.in
+++ b/debian/backport-iwlwifi-dkms.dkms.in
@@ -1,6 +1,7 @@
 PACKAGE_NAME="@DKMS_PACKAGE_NAME@"
 PACKAGE_VERSION="#MODULE_VERSION#"
 AUTOINSTALL="yes"
+OBSOLETE_BY="5.4.0"
 
 BUILT_MODULE_NAME[0]="compat"
 BUILT_MODULE_LOCATION[0]="compat"
diff --git a/debian/changelog b/debian/changelog
index ab4bcc3..77179e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+backport-iwlwifi-dkms (8324-0ubuntu2) groovy; urgency=medium
+
+  * dkms: add OBSOLETE_BY=5.4.0 (LP: #1863583)
+  * debian: drop modaliases support (LP: #1869587)
+
+ -- You-Sheng Yang <[e-mail]>  Fri, 15 May 2020 16:28:22 +0800
+
 backport-iwlwifi-dkms (8324-0ubuntu1) focal; urgency=low
 
   * New release
diff --git a/debian/control b/debian/control
index b85c500..f909b74 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: You-Sheng Yang <[e-mail]>
 Build-Depends:
  debhelper (>=9),
- dh-modaliases,
  dkms,
  quilt,
 Standards-Version: 4.3.0
@@ -19,7 +18,6 @@ Depends:
  libc6-dev | libc-dev,
  ${misc:Depends},
 Provides: iwlwifi-modules
-XB-Modaliases: ${modaliases}
 Description: iwlwifi driver backport in DKMS format
  Intel works with periodic releases of the iwlwifi driver that are
  tested with a specific combination of components such as firmware and
diff --git a/debian/rules b/debian/rules
index 429ab0d..fa8049e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ GENERATED_DKMS_FILES= \
     debian/backport-iwlwifi-dkms.dkms
 
 %:
-	dh $@ --with dkms,modaliases
+	dh $@ --with dkms
 
 override_dh_auto_configure:
 override_dh_auto_build: