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

[You-Sheng Yang]

* dkms: add OBSOLETE_BY=5.4.0 (LP: #1863583)
* debian: drop modaliases support (LP: #1869587)
* update debian version to 8324-0ubuntu2~20.04.1

Find prebuilt packages in https://launchpad.net/~vicamo/+archive/ubuntu/ppa-1863583.

[You-Sheng Yang (vicamo)]

* dkms: stop installing kernel on 5.4 or newer (LP: #1863583)
  - add OBSOLETE_BY=5.4.0
  - fix autopkgtest runs
* debian: drop modaliases support (LP: #1869587)

[You-Sheng Yang (vicamo)]

Tested autopkgtest for focal-amd64, focal-arm64, focal-ppc64el. Other arches always fail as expected.

[You-Sheng Yang (vicamo)]

verified focal-proposed version 8324-0ubuntu3~20.04.1.

review: Approve

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..4aae555 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+backport-iwlwifi-dkms (8324-0ubuntu3~20.04.1) focal; urgency=medium
+
+  * dkms: stop installing kernel on 5.4 or newer (LP: #1863583)
+    - add OBSOLETE_BY=5.4.0
+    - fix autopkgtest runs
+  * debian: drop modaliases support (LP: #1869587)
+
+ -- You-Sheng Yang <[e-mail]>  Wed, 03 Jun 2020 11:20:56 +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:
diff --git a/debian/tests/dkms-autopkgtest b/debian/tests/dkms-autopkgtest
index f766e18..0d79513 100755
--- a/debian/tests/dkms-autopkgtest
+++ b/debian/tests/dkms-autopkgtest
@@ -39,7 +39,7 @@ run_pkg() {
     fi
     echo "$dkmsstatus"
 
-    if ! echo "$dkmsstatus" | grep -q "installed$"; then
+    if ! echo "$dkmsstatus" | grep -q "installed"; then
         echo "E: not installed" >&2
         exit 1
     fi