Source: qlcplus Version: 4.12.7-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 qlcplus-4.12.7/debian/changelog qlcplus-4.12.7/debian/changelog --- qlcplus-4.12.7/debian/changelog 2023-05-25 19:43:39.000000000 +0200 +++ qlcplus-4.12.7/debian/changelog 2023-12-16 23:31:26.000000000 +0100 @@ -1,3 +1,10 @@ +qlcplus (4.12.7-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use udev.pc to place udev files. (Closes: #-1) + + -- Chris Hofstaedtler <z...@debian.org> Sat, 16 Dec 2023 23:31:26 +0100 + qlcplus (4.12.7-1) unstable; urgency=medium * New upstream version 4.12.7 diff -Nru qlcplus-4.12.7/debian/control qlcplus-4.12.7/debian/control --- qlcplus-4.12.7/debian/control 2023-05-25 19:43:39.000000000 +0200 +++ qlcplus-4.12.7/debian/control 2023-12-16 23:31:26.000000000 +0100 @@ -20,6 +20,7 @@ qtscript5-dev, qttools5-dev-tools, shared-mime-info (>= 0.71), + systemd-dev, xauth <!nocheck>, xvfb <!nocheck> Standards-Version: 4.6.2 diff -Nru qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch --- qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch 2023-05-25 19:43:39.000000000 +0200 +++ qlcplus-4.12.7/debian/patches/0001-install-udev-rules-in-system-directory.patch 2023-12-16 23:31:26.000000000 +0100 @@ -7,16 +7,15 @@ variables.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/variables.pri b/variables.pri -index 0fc7258..7cbf343 100644 ---- a/variables.pri -+++ b/variables.pri -@@ -251,7 +251,7 @@ android:USERCOLORFILTERSDIR = $$USERDATADIR/colorfilters +Index: qlcplus-4.12.7/variables.pri +=================================================================== +--- qlcplus-4.12.7.orig/variables.pri ++++ qlcplus-4.12.7/variables.pri +@@ -251,7 +251,6 @@ android:USERCOLORFILTERSDIR = $$USERD ios:USERCOLORFILTERSDIR = $$USERDATADIR/ColorFilters # udev rules -unix:!macx:UDEVRULESDIR = /etc/udev/rules.d -+unix:!macx:UDEVRULESDIR = /lib/udev/rules.d # AppStream metadata unix:!macx:METAINFODIR = $$INSTALLROOT/share/metainfo diff -Nru qlcplus-4.12.7/debian/qlcplus.install qlcplus-4.12.7/debian/qlcplus.install --- qlcplus-4.12.7/debian/qlcplus.install 2023-05-25 19:43:39.000000000 +0200 +++ qlcplus-4.12.7/debian/qlcplus.install 2023-12-16 23:31:18.000000000 +0100 @@ -1,4 +1,4 @@ -lib/udev/rules.d/ +${env:deb_udevdir}/rules.d/ usr/bin/qlcplus* usr/lib/*/libqlcplus*.so.* usr/lib/*/qt5/plugins/qlcplus/ diff -Nru qlcplus-4.12.7/debian/rules qlcplus-4.12.7/debian/rules --- qlcplus-4.12.7/debian/rules 2023-05-25 19:43:39.000000000 +0200 +++ qlcplus-4.12.7/debian/rules 2023-12-16 23:31:02.000000000 +0100 @@ -9,6 +9,8 @@ TESTS_HOME = $(CURDIR)/debian/tests.home +export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,) + %: dh $@ @@ -18,7 +20,7 @@ override_dh_auto_configure: ./translate.sh - dh_auto_configure -- FORCECONFIG=release + dh_auto_configure -- FORCECONFIG=release UDEVRULESDIR=/$(deb_udevdir)/rules.d override_dh_auto_install: dh_auto_install