Source: beep
Version: 1.4.9-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

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

Attached you will find a patch to delegate the exact placement of
the udev files to udev.pc (using pkg-config). This should work today
in unstable and, if necessary, for bookworm. Once udev.pc in
unstable points to /usr/lib your package will benefit automatically
after a binNMU or any other upload.

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

Per the wiki, it is advisable to upload to experimental first, and
wait a few days for the dumat tool to check your package. The same
is advisable when any structural changes are done in the trixie
cycle.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru beep-1.4.9/debian/beep.install beep-1.4.9/debian/beep.install
--- beep-1.4.9/debian/beep.install	2020-05-16 22:34:14.000000000 +0200
+++ beep-1.4.9/debian/beep.install	2023-12-07 23:33:18.000000000 +0100
@@ -1,4 +1,4 @@
 usr/bin
 usr/share/doc/beep
 usr/share/man
-debian/70-pcspkr-beep.rules lib/udev/rules.d/
+debian/70-pcspkr-beep.rules ${env:deb_udevdir}/rules.d/
diff -Nru beep-1.4.9/debian/beep-udeb.install beep-1.4.9/debian/beep-udeb.install
--- beep-1.4.9/debian/beep-udeb.install	2020-05-16 22:34:14.000000000 +0200
+++ beep-1.4.9/debian/beep-udeb.install	2023-12-07 23:33:13.000000000 +0100
@@ -1,2 +1,2 @@
 usr/bin
-debian/70-pcspkr-beep.rules lib/udev/rules.d/
+debian/70-pcspkr-beep.rules ${env:deb_udevdir}/rules.d/
diff -Nru beep-1.4.9/debian/changelog beep-1.4.9/debian/changelog
--- beep-1.4.9/debian/changelog	2020-05-16 22:53:59.000000000 +0200
+++ beep-1.4.9/debian/changelog	2023-12-07 23:34:12.000000000 +0100
@@ -1,3 +1,10 @@
+beep (1.4.9-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev files to pkg-config data
+
+ -- Chris Hofstaedtler <z...@debian.org>  Thu, 07 Dec 2023 23:34:12 +0100
+
 beep (1.4.9-1) unstable; urgency=medium
 
   [ Rhonda D'Vine ]
diff -Nru beep-1.4.9/debian/control beep-1.4.9/debian/control
--- beep-1.4.9/debian/control	2020-05-16 22:46:17.000000000 +0200
+++ beep-1.4.9/debian/control	2023-12-07 23:34:12.000000000 +0100
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Rhonda D'Vine <rho...@debian.org>
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13), pkgconf, systemd-dev
 Standards-Version: 4.5.0
 Homepage: https://github.com/spkr-beep/beep
 Vcs-Browser: https://salsa.debian.org/rhonda/beep
diff -Nru beep-1.4.9/debian/rules beep-1.4.9/debian/rules
--- beep-1.4.9/debian/rules	2020-05-16 22:34:14.000000000 +0200
+++ beep-1.4.9/debian/rules	2023-12-07 23:34:12.000000000 +0100
@@ -4,6 +4,8 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 -include /usr/share/dpkg/buildtools.mk
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
 %:
 	dh $@
 

Reply via email to