From d24b1734a7a8b1069426fbb8ce80328959560ea9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 11 May 2018 06:52:52 +0000 Subject: [PATCH] Pass the basename of the tmpfiles to "systemd-tmpfiles --create" Signed-off-by: Niels Thykier Bug: upstream, https://salsa.debian.org/debian/debhelper/commit/d24b1734a7a8b1069426fbb8ce80328959560ea9 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1748147 diff -Nru debhelper-9.20160115ubuntu3/debian/changelog debhelper-9.20160115ubuntu4/debian/changelog --- debhelper-9.20160115ubuntu3/debian/changelog 2016-03-31 10:57:01.000000000 -0700 +++ debhelper-9.20160115ubuntu4/debian/changelog 2018-05-24 22:13:38.000000000 -0700 @@ -1,3 +1,9 @@ +debhelper (9.20160115ubuntu4) xenial; urgency=medium + + * Support overrides in tmpfiles.d + + -- Seyeong Kim Thu, 24 May 2018 22:12:58 -0700 + debhelper (9.20160115ubuntu3) xenial; urgency=medium * Backport upstream commit 9ca73a0a ("Pass -a to grep to handle diff -Nru debhelper-9.20160115ubuntu3/dh_installinit debhelper-9.20160115ubuntu4/dh_installinit --- debhelper-9.20160115ubuntu3/dh_installinit 2016-01-19 10:54:31.000000000 -0800 +++ debhelper-9.20160115ubuntu4/dh_installinit 2018-05-24 22:12:57.000000000 -0700 @@ -269,7 +269,7 @@ $name =~ s/^\Q$tmp\E//g; if ($name =~ m,^/usr/lib/tmpfiles\.d/, || $name =~ m,^/etc/tmpfiles\.d/,) { - push @tmpfiles, $name; + push(@tmpfiles, basename($name)); } }, no_chdir => 1,