Control: tags -1 + patch
* Chris Hofstaedtler <z...@debian.org> [231202 02:17]:
> your package installs the file /lib/udev/rules.d/90-pipewire-alsa.rules.
[..]
Please find a patch attached, which delegates placement of the rules
file to udev.pc. In a few weeks, udev.pc will change "udevdir" to
/usr/lib/udev/rules.d, and then your package will pick the new path
up on the next upload or binNMU.
Additionaly, backports do not need to revert anything.
Best,
Chris
diff -Nru pipewire-1.0.0/debian/changelog pipewire-1.0.0/debian/changelog
--- pipewire-1.0.0/debian/changelog 2023-11-27 11:37:05.000000000 +0100
+++ pipewire-1.0.0/debian/changelog 2023-12-02 02:08:47.000000000 +0100
@@ -1,3 +1,10 @@
+pipewire (1.0.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Set udevrulesdir based on udev.pc content
+
+ -- Chris <z...@debian.org> Sat, 02 Dec 2023 02:08:47 +0100
+
pipewire (1.0.0-1) unstable; urgency=medium
* New upstream release
diff -Nru pipewire-1.0.0/debian/control pipewire-1.0.0/debian/control
--- pipewire-1.0.0/debian/control 2023-11-27 11:37:05.000000000 +0100
+++ pipewire-1.0.0/debian/control 2023-12-02 02:08:47.000000000 +0100
@@ -43,7 +43,8 @@
modemmanager-dev,
pkg-config,
python3-docutils,
- systemd [linux-any]
+ systemd [linux-any],
+ udev [linux-any]
Build-Conflicts: libfdk-aac-dev
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/utopia-team/pipewire
diff -Nru pipewire-1.0.0/debian/pipewire-bin.install pipewire-1.0.0/debian/pipewire-bin.install
--- pipewire-1.0.0/debian/pipewire-bin.install 2023-11-27 11:37:05.000000000 +0100
+++ pipewire-1.0.0/debian/pipewire-bin.install 2023-12-02 02:08:47.000000000 +0100
@@ -7,7 +7,6 @@
usr/share/pipewire/pipewire-aes67.conf
usr/share/pipewire/pipewire-avb.conf
usr/share/pipewire/minimal.conf
-lib/udev/rules.d
usr/bin/pipewire
usr/bin/pipewire-aes67
usr/bin/pipewire-avb
diff -Nru pipewire-1.0.0/debian/rules pipewire-1.0.0/debian/rules
--- pipewire-1.0.0/debian/rules 2023-11-27 11:37:05.000000000 +0100
+++ pipewire-1.0.0/debian/rules 2023-12-02 02:08:47.000000000 +0100
@@ -45,6 +45,13 @@
LIBFFADO=enabled
endif
+ifneq (,$(filter hurd-i386,$(DEB_HOST_ARCH)))
+UDEVRULESDIR=
+else
+UDEVRULESDIR=$(shell pkg-config --variable=udevdir udev)/rules.d
+endif
+
+
override_dh_auto_configure:
dh_auto_configure -- \
-Daudiotestsrc=enabled \
@@ -69,6 +76,7 @@
-Dsdl2=$(SDL2) \
-Dsession-managers= \
-Dtest=enabled \
+ -Dudevrulesdir=$(UDEVRULESDIR) \
-Dvideotestsrc=enabled \
-Dvulkan=disabled \
$(NULL)
@@ -91,6 +99,10 @@
--timeout-multiplier $(test_timeout_multiplier) \
$(NULL)
+override_dh_install:
+ dh_install
+ test -n "$(UDEVRULESDIR)" && dh_install -ppipewire-bin $(UDEVRULESDIR)
+
override_dh_missing:
dh_missing --fail-missing
