Source: libirecovery
Version: 1.0.0-5
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 to delegate the exact placement of
the udev files to udev.pc (using pkg-config). This should work today
in unstable and, if necessary, for bookworm. Once udev.pc in
unstable points to /usr/lib your package will benefit automatically
after a binNMU or any other upload.
Later during the trixie cycle I expect this bug class to raise in
priority.
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.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru libirecovery-1.0.0/debian/changelog libirecovery-1.0.0/debian/changelog
--- libirecovery-1.0.0/debian/changelog 2020-10-22 18:02:40.000000000 +0200
+++ libirecovery-1.0.0/debian/changelog 2023-12-08 23:19:40.000000000 +0100
@@ -1,3 +1,11 @@
+libirecovery (1.0.0-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Delegate placement of udev files to pkg-config data
+ * Use dh compat 13 (from 12), for substitutions in .install files
+
+ -- Chris Hofstaedtler <z...@debian.org> Fri, 08 Dec 2023 23:19:40 +0100
+
libirecovery (1.0.0-5) unstable; urgency=medium
* d/rules: force udev rules dir to prevent usrmerge discrepancy
diff -Nru libirecovery-1.0.0/debian/control libirecovery-1.0.0/debian/control
--- libirecovery-1.0.0/debian/control 2020-10-22 18:02:40.000000000 +0200
+++ libirecovery-1.0.0/debian/control 2023-12-08 23:19:01.000000000 +0100
@@ -5,10 +5,11 @@
Uploaders: Yves-Alexis Perez <cor...@debian.org>
Standards-Version: 4.5.0
Build-Depends: autoconf-archive,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
libreadline-dev,
libusb-1.0-0-dev,
- pkg-config
+ pkg-config,
+ systemd-dev
Homepage: https://www.libimobiledevice.org/
Vcs-Git: https://salsa.debian.org/imobiledevice-team/libirecovery.git
Vcs-Browser: https://salsa.debian.org/imobiledevice-team/libirecovery
diff -Nru libirecovery-1.0.0/debian/libirecovery-common.install libirecovery-1.0.0/debian/libirecovery-common.install
--- libirecovery-1.0.0/debian/libirecovery-common.install 2020-10-22 18:02:40.000000000 +0200
+++ libirecovery-1.0.0/debian/libirecovery-common.install 2023-12-08 23:19:31.000000000 +0100
@@ -1,2 +1,2 @@
debian/org.libimobiledevice.libirecovery.metainfo.xml /usr/share/metainfo/
-lib/udev/rules.d/39-libirecovery.rules
+${env:deb_udevdir}/rules.d/39-libirecovery.rules
diff -Nru libirecovery-1.0.0/debian/rules libirecovery-1.0.0/debian/rules
--- libirecovery-1.0.0/debian/rules 2020-10-22 18:02:40.000000000 +0200
+++ libirecovery-1.0.0/debian/rules 2023-12-08 23:19:40.000000000 +0100
@@ -2,13 +2,13 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-O1 -Wl,-z,defs
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
%:
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --with-udevrule="TAG+=\"uaccess\"" \
- --with-udevrulesdir=/lib/udev/rules.d
+ dh_auto_configure -- --with-udevrule="TAG+=\"uaccess\""
override_dh_missing:
dh_missing --fail-missing
