Source: ifplugd
Version: 0.28-19.5
Severity: normal
Tags: patch
User: [email protected]
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.

Per the wiki, it is advisable to upload to experimental first, and
wait a few days for the dumat tool to check your package. The same
is advisable when any structural changes are done in the trixie
cycle.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru ifplugd-0.28/debian/changelog ifplugd-0.28/debian/changelog
--- ifplugd-0.28/debian/changelog	2020-08-22 21:43:42.000000000 +0200
+++ ifplugd-0.28/debian/changelog	2023-12-08 11:37:31.000000000 +0100
@@ -1,3 +1,11 @@
+ifplugd (0.28-19.6) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev files to pkg-config data
+  * Build-Depends: Switch from pkg-config to pkgconf
+
+ -- Chris Hofstaedtler <[email protected]>  Fri, 08 Dec 2023 11:37:31 +0100
+
 ifplugd (0.28-19.5) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru ifplugd-0.28/debian/control ifplugd-0.28/debian/control
--- ifplugd-0.28/debian/control	2020-08-22 21:12:46.000000000 +0200
+++ ifplugd-0.28/debian/control	2023-12-08 11:37:31.000000000 +0100
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Walter Franzini <[email protected]>
-Build-Depends: debhelper (>= 9), autotools-dev, libdaemon-dev (>= 0.7), pkg-config, po-debconf
+Build-Depends: debhelper (>= 9), autotools-dev, libdaemon-dev (>= 0.7), pkgconf, po-debconf, systemd-dev
 Standards-Version: 3.9.8
 Homepage: http://0pointer.de/lennart/projects/ifplugd/
 Vcs-Git: https://git.dgit.debian.org/ifplugd
diff -Nru ifplugd-0.28/debian/dirs ifplugd-0.28/debian/dirs
--- ifplugd-0.28/debian/dirs	2020-08-22 21:12:46.000000000 +0200
+++ ifplugd-0.28/debian/dirs	2023-12-08 11:37:31.000000000 +0100
@@ -5,6 +5,5 @@
 etc/apm/resume.d
 etc/apm/other.d
 etc/pm/sleep.d
-lib/udev
 etc/ifplugd/action.d/
 usr/share/bug/ifplugd/
diff -Nru ifplugd-0.28/debian/rules ifplugd-0.28/debian/rules
--- ifplugd-0.28/debian/rules	2020-08-22 21:12:46.000000000 +0200
+++ ifplugd-0.28/debian/rules	2023-12-08 11:37:31.000000000 +0100
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
 confopts = --disable-subversion \
 	--disable-xmltoman \
 	--disable-lynx --with-initdir=/etc/init.d
@@ -30,7 +32,8 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ifplugd
 	# now handled by debconf:
 	rm -f $(CURDIR)/debian/ifplugd/etc/ifplugd/ifplugd.conf
-	install -m 755 debian/ifplugd.udev.agent $(CURDIR)/debian/ifplugd/lib/udev/ifplugd.agent
+	install -d $(CURDIR)/debian/ifplugd/$(deb_udevdir)
+	install -m 755 debian/ifplugd.udev.agent $(CURDIR)/debian/ifplugd/$(deb_udevdir)/ifplugd.agent
 	install -m 755 debian/ifplugd.action $(CURDIR)/debian/ifplugd/etc/ifplugd/
 	install -m 755 debian/ifupdown.action $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/ifupdown
 	install -m 755 debian/pm/ifplugd $(CURDIR)/debian/ifplugd/etc/apm/scripts.d/

Reply via email to