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-10.7.2ubuntu2/debian/changelog debhelper-10.7.2ubuntu3/debian/changelog --- debhelper-10.7.2ubuntu2/debian/changelog 2017-08-06 08:13:33.000000000 -0700 +++ debhelper-10.7.2ubuntu3/debian/changelog 2018-05-24 22:01:44.000000000 -0700 @@ -1,3 +1,9 @@ +debhelper (10.7.2ubuntu3) artful; urgency=medium + + * Support overrides in tmpfiles.d + + -- Seyeong Kim Thu, 24 May 2018 22:00:32 -0700 + debhelper (10.7.2ubuntu2) artful; urgency=high * Define U_PARAMS correctly in dh_builddeb, and don't try to use it when it diff -Nru debhelper-10.7.2ubuntu2/dh_installinit debhelper-10.7.2ubuntu3/dh_installinit --- debhelper-10.7.2ubuntu2/dh_installinit 2017-08-01 07:11:19.000000000 -0700 +++ debhelper-10.7.2ubuntu3/dh_installinit 2018-05-24 22:00:22.000000000 -0700 @@ -290,7 +290,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,