From d24b1734a7a8b1069426fbb8ce80328959560ea9 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
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 <niels@thykier.net>

Bug: upstream, https://salsa.debian.org/debian/debhelper/commit/d24b1734a7a8b1069426fbb8ce80328959560ea9
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1748147

diff -Nru debhelper-11.1.6ubuntu2/debian/changelog debhelper-11.1.6ubuntu3/debian/changelog
--- debhelper-11.1.6ubuntu2/debian/changelog	2018-05-10 02:11:57.000000000 -0700
+++ debhelper-11.1.6ubuntu3/debian/changelog	2018-05-24 05:45:21.000000000 -0700
@@ -1,3 +1,10 @@
+debhelper (11.1.6ubuntu3) bionic; urgency=medium
+
+  * Support overrides in tmpfiles.d
+
+ -- Seyeong Kim <seyeong.kim@canonical.com>  Thu, 24 May 2018 05:45:04 -0700
+
 debhelper (11.1.6ubuntu2) bionic; urgency=medium
 
   [ Iain Lane ]
diff -Nru debhelper-11.1.6ubuntu2/dh_installinit debhelper-11.1.6ubuntu3/dh_installinit
--- debhelper-11.1.6ubuntu2/dh_installinit	2018-01-07 07:08:16.000000000 -0800
+++ debhelper-11.1.6ubuntu3/dh_installinit	2018-05-24 05:45:01.000000000 -0700
@@ -326,7 +326,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,
diff -Nru debhelper-11.1.6ubuntu2/dh_installsystemd debhelper-11.1.6ubuntu3/dh_installsystemd
--- debhelper-11.1.6ubuntu2/dh_installsystemd	2018-01-07 07:08:16.000000000 -0800
+++ debhelper-11.1.6ubuntu3/dh_installsystemd	2018-05-24 05:45:01.000000000 -0700
@@ -337,8 +337,7 @@
 				wanted   => sub {
 					my $name = $File::Find::name;
 					return unless -f $name;
-					$name =~ s/^\Q$tmpdir\E//g;
-					push(@tmpfiles, $name);
+					push(@tmpfiles, basename($name));
 				},
 				no_chdir => 1,
 			}, @dirs) if @dirs;