Source: osspd
Version: 1.3.2-13.1
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2
Hi!
Your package installs files into /lib/{udev,modules-load.d}.
For the ongoing Debian UsrMerge effort [1] these files should move
to /usr in the trixie cycle.
I'm attaching a patch to implement such a move.
However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru osspd-1.3.2/debian/changelog osspd-1.3.2/debian/changelog
--- osspd-1.3.2/debian/changelog 2023-02-04 19:49:50.000000000 +0100
+++ osspd-1.3.2/debian/changelog 2023-12-24 22:18:57.000000000 +0100
@@ -1,3 +1,12 @@
+osspd (1.3.2-13.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install all files below /usr. (Closes: #-1)
+ For udev rules, use udev.pc to find correct install location.
+ For the rest, just hardcode /usr.
+
+ -- Chris Hofstaedtler <[email protected]> Sun, 24 Dec 2023 22:18:57 +0100
+
osspd (1.3.2-13.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru osspd-1.3.2/debian/control osspd-1.3.2/debian/control
--- osspd-1.3.2/debian/control 2023-02-04 19:49:50.000000000 +0100
+++ osspd-1.3.2/debian/control 2023-12-24 22:18:57.000000000 +0100
@@ -6,7 +6,9 @@
Build-Depends: debhelper-compat (= 13),
libasound2-dev,
libfuse-dev,
- libpulse-dev
+ libpulse-dev,
+ pkgconf,
+ systemd-dev
Standards-Version: 4.3.0
Homepage: https://sourceforge.net/projects/osspd/
Vcs-Browser: https://salsa.debian.org/debian/osspd
diff -Nru osspd-1.3.2/debian/osspd.install osspd-1.3.2/debian/osspd.install
--- osspd-1.3.2/debian/osspd.install 2023-02-04 19:49:50.000000000 +0100
+++ osspd-1.3.2/debian/osspd.install 2023-12-24 22:17:44.000000000 +0100
@@ -1,2 +1,2 @@
-lib/udev/rules.d/98-osscuse.rules
+${env:deb_udevdir}/rules.d/98-osscuse.rules
usr/sbin/osspd
diff -Nru osspd-1.3.2/debian/rules osspd-1.3.2/debian/rules
--- osspd-1.3.2/debian/rules 2023-02-04 19:49:50.000000000 +0100
+++ osspd-1.3.2/debian/rules 2023-12-24 22:18:10.000000000 +0100
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
SLAVESDIR=/usr/lib/osspd
-UDEVDIR=/lib/udev/rules.d
+UDEVDIR=/${deb_udevdir}/rules.d
%:
dh $@
@@ -18,7 +19,7 @@
override_dh_install:
dh_install
# adding kmod integration
- install -D -m 0644 debian/osspd.kmod debian/osspd/lib/modules-load.d/osspd.conf
+ install -D -m 0644 debian/osspd.kmod debian/osspd/usr/lib/modules-load.d/osspd.conf
# Disable tests, they require running the osspd
override_dh_auto_test:
