Source: bluez-qt
Version: 5.107.0-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 bluez-qt-5.107.0/debian/changelog bluez-qt-5.107.0/debian/changelog
--- bluez-qt-5.107.0/debian/changelog 2023-06-18 16:08:24.000000000 +0200
+++ bluez-qt-5.107.0/debian/changelog 2023-12-16 19:29:22.000000000 +0100
@@ -1,3 +1,10 @@
+bluez-qt (5.107.0-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 19:29:22 +0100
+
bluez-qt (5.107.0-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -Nru bluez-qt-5.107.0/debian/control bluez-qt-5.107.0/debian/control
--- bluez-qt-5.107.0/debian/control 2023-06-18 16:05:36.000000000 +0200
+++ bluez-qt-5.107.0/debian/control 2023-12-16 19:29:22.000000000 +0100
@@ -11,11 +11,13 @@
extra-cmake-modules (>= 5.107.0~),
libqt5sql5-sqlite,
pkg-kde-tools (>> 0.15.15),
+ pkgconf,
qml-module-qttest <!nocheck>,
qtbase5-dev (>= 5.15.2~),
qtdeclarative5-dev (>= 5.15.2~),
qttools5-dev,
qttools5-dev-tools,
+ systemd-dev,
xauth <!nocheck>,
xvfb <!nocheck>,
Standards-Version: 4.6.2
diff -Nru bluez-qt-5.107.0/debian/libkf5bluezqt-data.install bluez-qt-5.107.0/debian/libkf5bluezqt-data.install
--- bluez-qt-5.107.0/debian/libkf5bluezqt-data.install 2022-08-21 17:08:55.000000000 +0200
+++ bluez-qt-5.107.0/debian/libkf5bluezqt-data.install 2023-12-16 19:29:22.000000000 +0100
@@ -1,3 +1,3 @@
-lib/udev/rules.d/61-kde-bluetooth-rfkill.rules
+${env:deb_udevdir}/rules.d/61-kde-bluetooth-rfkill.rules
usr/share/qlogging-categories5/bluezqt.categories
usr/share/qlogging-categories5/bluezqt.renamecategories
diff -Nru bluez-qt-5.107.0/debian/libkf5bluezqt-data.lintian-overrides bluez-qt-5.107.0/debian/libkf5bluezqt-data.lintian-overrides
--- bluez-qt-5.107.0/debian/libkf5bluezqt-data.lintian-overrides 2023-06-17 07:37:36.000000000 +0200
+++ bluez-qt-5.107.0/debian/libkf5bluezqt-data.lintian-overrides 2023-12-16 19:29:22.000000000 +0100
@@ -1,2 +1,6 @@
+# begin-remove-after: released:forky
# This only sets uaccess, we do not actually have hardware support here.
libkf5bluezqt-data: appstream-metadata-missing-modalias-provide lib/udev/rules.d/61-kde-bluetooth-rfkill.rules
+# end-remove-after
+# This only sets uaccess, we do not actually have hardware support here.
+libkf5bluezqt-data: appstream-metadata-missing-modalias-provide usr/lib/udev/rules.d/61-kde-bluetooth-rfkill.rules
diff -Nru bluez-qt-5.107.0/debian/rules bluez-qt-5.107.0/debian/rules
--- bluez-qt-5.107.0/debian/rules 2023-03-16 22:42:01.000000000 +0100
+++ bluez-qt-5.107.0/debian/rules 2023-12-16 19:29:22.000000000 +0100
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
# Disable fixfilepath, as it triggers build failures.
export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=-fixfilepath
@@ -7,7 +8,7 @@
dh $@ --with pkgkde_symbolshelper
override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_QCH=ON
+ dh_auto_configure -- -DBUILD_QCH=ON -DUDEV_RULES_INSTALL_DIR=/${deb_udevdir}/rules.d
override_dh_auto_test:
xvfb-run -a dbus-run-session dh_auto_test
