Control: tags 1057240 + patch
Control: tags 1057240 + pending
Dear maintainer,
I've prepared an NMU for alsa-utils (versioned as 1.2.10-1.1) and
uploaded it to DELAYED/7.
The NMU/patch also fixes the install path for systemd units and
moves the d-i script.
Chris
diff -Nru alsa-utils-1.2.10/debian/alsa-utils-udeb.install alsa-utils-1.2.10/debian/alsa-utils-udeb.install
--- alsa-utils-1.2.10/debian/alsa-utils-udeb.install 2019-10-30 11:35:09.000000000 +0100
+++ alsa-utils-1.2.10/debian/alsa-utils-udeb.install 2023-12-24 12:42:40.000000000 +0100
@@ -1,4 +1,4 @@
-debian/S37alsa-utils-udeb lib/debian-installer-startup.d
+debian/S37alsa-utils-udeb usr/lib/debian-installer-startup.d
debian/utils.sh /usr/share/alsa
usr/bin/amixer
usr/sbin/alsactl
diff -Nru alsa-utils-1.2.10/debian/changelog alsa-utils-1.2.10/debian/changelog
--- alsa-utils-1.2.10/debian/changelog 2023-09-13 15:45:59.000000000 +0200
+++ alsa-utils-1.2.10/debian/changelog 2023-12-24 12:42:40.000000000 +0100
@@ -1,3 +1,14 @@
+alsa-utils (1.2.10-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use udevdir from udev.pc to determine udev rules install path.
+ (Closes: #1057240)
+ * Use systemdsystemunitdir from systemd.pc to determine systemd unit install
+ path.
+ * udeb: move debian-installer-startup.d/S37alsa-utils-udeb into /usr/lib.
+
+ -- Chris Hofstaedtler <z...@debian.org> Sun, 24 Dec 2023 12:42:40 +0100
+
alsa-utils (1.2.10-1) unstable; urgency=medium
* New upstream release.
diff -Nru alsa-utils-1.2.10/debian/control alsa-utils-1.2.10/debian/control
--- alsa-utils-1.2.10/debian/control 2023-06-13 13:42:46.000000000 +0200
+++ alsa-utils-1.2.10/debian/control 2023-12-24 12:40:58.000000000 +0100
@@ -14,6 +14,7 @@
pkg-config,
python3-docutils,
systemd,
+ systemd-dev,
xmlto
Standards-Version: 4.6.2
Homepage: https://www.alsa-project.org/
diff -Nru alsa-utils-1.2.10/debian/install alsa-utils-1.2.10/debian/install
--- alsa-utils-1.2.10/debian/install 2022-07-06 03:17:35.000000000 +0200
+++ alsa-utils-1.2.10/debian/install 2023-12-24 12:42:40.000000000 +0100
@@ -1,6 +1,6 @@
debian/utils.sh /usr/share/alsa
-lib/systemd
-lib/udev
+${env:deb_systemdsystemunitdir}
+${env:deb_udevdir}/rules.d
usr/bin
usr/lib/*/alsa-topology/*.so
usr/sbin
diff -Nru alsa-utils-1.2.10/debian/links alsa-utils-1.2.10/debian/links
--- alsa-utils-1.2.10/debian/links 2019-10-30 11:35:09.000000000 +0100
+++ alsa-utils-1.2.10/debian/links 2023-12-24 12:42:40.000000000 +0100
@@ -1,3 +1,3 @@
-dev/null lib/systemd/system/alsa-utils.service
+dev/null ${env:deb_systemdsystemunitdir}/alsa-utils.service
usr/bin/aplay usr/bin/arecord
usr/share/man/man1/aplay.1.gz usr/share/man/man1/arecord.1.gz
diff -Nru alsa-utils-1.2.10/debian/rules alsa-utils-1.2.10/debian/rules
--- alsa-utils-1.2.10/debian/rules 2023-09-13 15:45:07.000000000 +0200
+++ alsa-utils-1.2.10/debian/rules 2023-12-24 12:41:31.000000000 +0100
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
%:
dh $@
@@ -10,7 +12,7 @@
--with-asound-state-dir=/var/lib/alsa \
--with-alsactl-home-dir=/run/alsa \
--with-alsactl-runtime-dir=/run/alsa/runtime \
- --with-systemdsystemunitdir=/lib/systemd/system \
+ --with-systemdsystemunitdir=/$(deb_systemdsystemunitdir) \
--disable-alsaconf
override_dh_auto_test:
