Package: libbmusb6
Version: 0.7.5-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package ships a udev rules file in /lib/udev/rules.d, and currently
hard-codes this path. As part of the UsrMerge effort[1], the install
path for udev rules must and will change soon. To pick up this change
with a binNMU, your package can use pkg-config to determine the install
location.
I'm attaching a patch to implement this.
Please apply at your earliest convenience.
Thanks,
Chris
diff -Nru bmusb-0.7.5/debian/changelog bmusb-0.7.5/debian/changelog
--- bmusb-0.7.5/debian/changelog 2020-04-07 21:29:27.000000000 +0200
+++ bmusb-0.7.5/debian/changelog 2023-11-27 18:41:53.000000000 +0100
@@ -1,3 +1,10 @@
+bmusb (0.7.5-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Defer placement of udev rules file to udev's pkg-config data.
+
+ -- Chris Hofstaedtler <z...@debian.org> Mon, 27 Nov 2023 18:41:53 +0100
+
bmusb (0.7.5-1) unstable; urgency=medium
* New upstream release.
diff -Nru bmusb-0.7.5/debian/compat bmusb-0.7.5/debian/compat
--- bmusb-0.7.5/debian/compat 2016-07-26 13:29:10.000000000 +0200
+++ bmusb-0.7.5/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru bmusb-0.7.5/debian/control bmusb-0.7.5/debian/control
--- bmusb-0.7.5/debian/control 2019-04-19 10:00:21.000000000 +0200
+++ bmusb-0.7.5/debian/control 2023-11-27 18:41:53.000000000 +0100
@@ -1,7 +1,7 @@
Source: bmusb
Priority: optional
Maintainer: Steinar H. Gunderson <se...@debian.org>
-Build-Depends: debhelper (>= 9), libusb-1.0-0-dev, pkg-config
+Build-Depends: debhelper-compat (= 13), libusb-1.0-0-dev, pkg-config, udev
Standards-Version: 3.9.8
Section: libs
diff -Nru bmusb-0.7.5/debian/libbmusb6.install
bmusb-0.7.5/debian/libbmusb6.install
--- bmusb-0.7.5/debian/libbmusb6.install 2020-04-07 21:29:27.000000000
+0200
+++ bmusb-0.7.5/debian/libbmusb6.install 2023-11-27 18:38:42.000000000
+0100
@@ -1,2 +1,2 @@
usr/lib/*/*.so.*
-lib/udev/rules.d/*
+${env:deb_udevdir}/rules.d/*
diff -Nru bmusb-0.7.5/debian/patches/debian-multiarch.diff
bmusb-0.7.5/debian/patches/debian-multiarch.diff
--- bmusb-0.7.5/debian/patches/debian-multiarch.diff 2020-04-07
21:29:27.000000000 +0200
+++ bmusb-0.7.5/debian/patches/debian-multiarch.diff 2023-11-27
18:39:46.000000000 +0100
@@ -7,16 +7,17 @@
===================================================================
--- bmusb-0.7.5.orig/Makefile
+++ bmusb-0.7.5/Makefile
-@@ -6,6 +6,8 @@ LN := ln
+@@ -6,6 +6,9 @@ LN := ln
RANLIB := ranlib
INSTALL := install
PREFIX := /usr
+DEB_MULTIARCH_TRIPLET := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR := $(PREFIX)/lib/$(DEB_MULTIARCH_TRIPLET)
++UDEVDIR := $(shell pkg-config --variable=udevdir udev)
LIB := libbmusb.a
SODEV := libbmusb.so
SONAME := libbmusb.so.6
-@@ -36,14 +38,16 @@ clean:
+@@ -36,14 +39,16 @@ clean:
install: all
$(INSTALL) -m 755 -o root -g root -d \
@@ -25,18 +26,20 @@
+ $(DESTDIR)$(LIBDIR) \
+ $(DESTDIR)$(LIBDIR)/pkgconfig \
$(DESTDIR)$(PREFIX)/include/bmusb \
- $(DESTDIR)/lib/udev/rules.d
+- $(DESTDIR)/lib/udev/rules.d
- $(INSTALL) -m 755 -o root -g root $(LIB) $(SOLIB)
$(DESTDIR)$(PREFIX)/lib
- $(LN) -sf $(SOLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
- $(LN) -sf $(SOLIB) $(DESTDIR)$(PREFIX)/lib/$(SODEV)
++ $(DESTDIR)$(UDEVDIR)/rules.d
+ $(INSTALL) -m 755 -o root -g root $(LIB) $(SOLIB) $(DESTDIR)$(LIBDIR)
+ $(LN) -sf $(SOLIB) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ $(LN) -sf $(SOLIB) $(DESTDIR)$(LIBDIR)/$(SODEV)
$(INSTALL) -m 755 -o root -g root bmusb/bmusb.h bmusb/fake_capture.h
$(DESTDIR)$(PREFIX)/include/bmusb
- $(INSTALL) -m 644 -o root -g root bmusb.pc
$(DESTDIR)$(PREFIX)/lib/pkgconfig
-+ $(INSTALL) -m 644 -o root -g root bmusb.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- $(INSTALL) -m 644 -o root -g root 70-bmusb.rules
$(DESTDIR)/lib/udev/rules.d
+- $(INSTALL) -m 644 -o root -g root 70-bmusb.rules
$(DESTDIR)/lib/udev/rules.d
-
++ $(INSTALL) -m 644 -o root -g root bmusb.pc $(DESTDIR)$(LIBDIR)/pkgconfig
++ $(INSTALL) -m 644 -o root -g root 70-bmusb.rules
$(DESTDIR)$(UDEVDIR)/rules.d
+ sed 's/@DEB_MULTIARCH_TRIPLET@/$(DEB_MULTIARCH_TRIPLET)/' < bmusb.pc >
$(DESTDIR)$(LIBDIR)/pkgconfig/bmusb.pc
+ chmod 0644 $(DESTDIR)$(LIBDIR)/pkgconfig/bmusb.pc
+ chown root:root $(DESTDIR)$(LIBDIR)/pkgconfig/bmusb.pc
diff -Nru bmusb-0.7.5/debian/rules bmusb-0.7.5/debian/rules
--- bmusb-0.7.5/debian/rules 2016-07-26 13:41:34.000000000 +0200
+++ bmusb-0.7.5/debian/rules 2023-11-27 18:41:53.000000000 +0100
@@ -1,4 +1,6 @@
#! /usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
%:
dh $@
