Bug#1116709: hw-detect: list_deb_firmware() does not find files in trixie packages after /usr merge

[alexander barakin <alex@barak.in>]

Source: hw-detect
Version: 1.159
Severity: normal
Tags: d-i patch
X-Debbugs-Cc: alex@barak.in

after implementation of https://wiki.debian.org/UsrMerge
firmware packages in trixie contain /usr/lib/firmware
in the paths (instead of /lib/firmware in bookworm).

compare:
https://packages.debian.org/bookworm-backports/all/firmware-iwlwifi/filelist
/lib/firmware/intel/ibt-0040-0041.ddc
...

and:
https://packages.debian.org/trixie/all/firmware-iwlwifi/filelist
/usr/lib/firmware/intel/ibt-0040-0041.ddc
...

therefore, the list_deb_firmware() function from check-missing-firmware.sh
does not find files in new packages.

the simplest solution is to ignore the "/usr" in the file paths
(the patch is attached).

diff --git a/check-missing-firmware.sh b/check-missing-firmware.sh
index 59bf4782..a862158e 100755
--- a/check-missing-firmware.sh
+++ b/check-missing-firmware.sh
@@ -263,8 +263,8 @@ ask_load_firmware () {
 
 list_deb_firmware () {
 	udpkg -c "$1" \
-		| grep '^\./lib/firmware/' \
-		| sed -e 's!^\./lib/firmware/!!' \
+		| grep '^\.\(/usr\)\?/lib/firmware/' \
+		| sed -e 's!^\.\(/usr\)\?/lib/firmware/!!' \
 		| grep -v '^$'
 }