Source: kinect-audio-setup
Version: 0.5-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs files related to udev, into /lib. These
files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].

Attached you will find a patch using udev.pc to place the udev files
(using pkg-config). This works today in unstable and also for
bookworm, and is safe to do now.
Once udev.pc in unstable points to /usr/lib, your package will
benefit automatically after a binNMU or any other upload.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.

Later during the trixie cycle I expect this bug class to raise in
priority.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru kinect-audio-setup-0.5/debian/changelog kinect-audio-setup-0.5/debian/changelog
--- kinect-audio-setup-0.5/debian/changelog	2016-01-09 18:55:47.000000000 +0100
+++ kinect-audio-setup-0.5/debian/changelog	2023-12-17 00:48:13.000000000 +0100
@@ -1,3 +1,10 @@
+kinect-audio-setup (0.5-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use udev.pc to place udev files. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sun, 17 Dec 2023 00:48:13 +0100
+
 kinect-audio-setup (0.5-1) unstable; urgency=medium
 
   * debian: update contact info and copyright dates
diff -Nru kinect-audio-setup-0.5/debian/control kinect-audio-setup-0.5/debian/control
--- kinect-audio-setup-0.5/debian/control	2016-01-09 18:55:47.000000000 +0100
+++ kinect-audio-setup-0.5/debian/control	2023-12-17 00:47:59.000000000 +0100
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 9),
                po-debconf,
                libusb-1.0-0-dev,
-               pkg-config
+               pkg-config,
+               systemd-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://git.ao2.it/kinect-audio-setup.git/
 Vcs-Git: git://git.ao2.it/kinect-audio-setup.git -b debian
diff -Nru kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch
--- kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch	1970-01-01 01:00:00.000000000 +0100
+++ kinect-audio-setup-0.5/debian/patches/Makefile-udevdir.patch	2023-12-17 00:48:13.000000000 +0100
@@ -0,0 +1,26 @@
+Index: kinect-audio-setup-0.5/Makefile
+===================================================================
+--- kinect-audio-setup-0.5.orig/Makefile
++++ kinect-audio-setup-0.5/Makefile
+@@ -1,3 +1,5 @@
++UDEVDIR = /lib/udev
++
+ all:
+ 	$(MAKE) -C kinect_upload_fw
+ 
+@@ -5,12 +7,12 @@ install:
+ 	$(MAKE) -C kinect_upload_fw install
+ 
+ install_udev_rules:
+-	install -d $(DESTDIR)/lib/udev/rules.d
+-	install -m 644 contrib/55-kinect_audio.rules.in $(DESTDIR)/lib/udev/rules.d/55-kinect_audio.rules
++	install -d $(DESTDIR)$(UDEVDIR)/rules.d
++	install -m 644 contrib/55-kinect_audio.rules.in $(DESTDIR)$(UDEVDIR)/rules.d/55-kinect_audio.rules
+ 	./kinect_patch_udev_rules \
+ 	  "$(FIRMWARE_PATH)" \
+ 	  "$(LOADER_PATH)" \
+-	  "$(DESTDIR)/lib/udev/rules.d/55-kinect_audio.rules"
++	  "$(DESTDIR)$(UDEVDIR)/rules.d/55-kinect_audio.rules"
+ 
+ clean:
+ 	$(MAKE) -C kinect_upload_fw clean
diff -Nru kinect-audio-setup-0.5/debian/patches/series kinect-audio-setup-0.5/debian/patches/series
--- kinect-audio-setup-0.5/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ kinect-audio-setup-0.5/debian/patches/series	2023-12-17 00:47:03.000000000 +0100
@@ -0,0 +1 @@
+Makefile-udevdir.patch
diff -Nru kinect-audio-setup-0.5/debian/rules kinect-audio-setup-0.5/debian/rules
--- kinect-audio-setup-0.5/debian/rules	2016-01-09 18:55:47.000000000 +0100
+++ kinect-audio-setup-0.5/debian/rules	2023-12-17 00:48:08.000000000 +0100
@@ -10,6 +10,7 @@
 	dh_auto_install
 	$(MAKE) install_udev_rules \
 	  DESTDIR=$(TMP) \
+	  UDEVDIR=$(shell pkg-config --variable=udevdir udev) \
 	  LOADER_PATH=/usr/sbin/kinect_upload_fw \
 	  FIRMWARE_PATH=/lib/firmware/kinect/UACFirmware
 

Reply via email to