Bug#1064478: wireless-regdb: install firmware files into /usr
Source: wireless-regdb
Version: 2022.06.06-1
Severity: normal
Tags: patch trixie sid
User: helmutg@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. wireless-regdb installs files into /lib; these should be moved
into the respective canonical locations in /usr/.
Please find a patch attached. It has been build-tested.
This should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.
If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].
Michael
[1] https://wiki.debian.org/UsrMerge
diff -Nru wireless-regdb-2022.06.06/debian/changelog wireless-regdb-2022.06.06/debian/changelog
--- wireless-regdb-2022.06.06/debian/changelog 2022-07-30 22:10:23.000000000 +0200
+++ wireless-regdb-2022.06.06/debian/changelog 2024-02-22 22:52:06.000000000 +0100
@@ -1,3 +1,10 @@
+wireless-regdb (2022.06.06-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install firmware files into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl@debian.org> Thu, 22 Feb 2024 22:52:06 +0100
+
wireless-regdb (2022.06.06-1) unstable; urgency=medium
* New upstream version:
diff -Nru wireless-regdb-2022.06.06/debian/rules wireless-regdb-2022.06.06/debian/rules
--- wireless-regdb-2022.06.06/debian/rules 2022-07-12 20:40:10.000000000 +0200
+++ wireless-regdb-2022.06.06/debian/rules 2024-02-22 22:52:06.000000000 +0100
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-export CRDA_PATH = /lib/crda
+export CRDA_PATH = /usr/lib/crda
+export FIRMWARE_PATH = /usr/lib/firmware
export REGDB_AUTHOR = $(shell dpkg-parsechangelog -SMaintainer | sed 's:.*<\(.*\)>:\1:')
export V = 1
# prevent the build system from calling lsb_release
@@ -41,11 +42,11 @@
install-wireless-regdb:
$(MAKE) -C debian/build DESTDIR=$(CURDIR)/$(DIR) install
for file in regulatory.db regulatory.db.p7s; do \
- install -m644 $$file $(DIR)/lib/firmware/$$file-upstream \
- && mv $(DIR)/lib/firmware/$$file $(DIR)/lib/firmware/$$file-debian \
+ install -m644 $$file $(DIR)/usr/lib/firmware/$$file-upstream \
+ && mv $(DIR)/usr/lib/firmware/$$file $(DIR)/usr/lib/firmware/$$file-debian \
|| exit; \
done
- rm -r $(DIR)/lib/crda
+ rm -r $(DIR)/usr/lib/crda
# regulatory.db.5 just includes regulatory.bin.5, so we need to
# install the latter as regulatory.db.5
mv $(DIR)/usr/share/man/man5/regulatory.bin.5.gz \
@@ -54,7 +55,7 @@
install-wireless-regdb-udeb: DIR = debian/wireless-regdb-udeb
install-wireless-regdb-udeb:
$(MAKE) -C debian/build DESTDIR=$(CURDIR)/$(DIR) install
- rm -r $(DIR)/lib/crda $(DIR)/usr/share/man
+ rm -r $(DIR)/usr/lib/crda $(DIR)/usr/share/man
rmdir --ignore-fail-on-non-empty -p $(DIR)/usr/share
override_dh_auto_clean:
Reply to: