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-29 19:02:48.000000000 -0700 @@ -1,3 +1,16 @@ +debhelper (11.1.6ubuntu3) bionic; urgency=medium + + * [d24b1734] Support overrides in tmpfiles.d (LP: #1748147) + - dh_installsystemd: Use the basename of the "tmpfiles" config + files. This makes "systemd-tmpfiles --create" search for it + in both /usr/lib/tmpfiles.d and in /etc/tmpfiles.d. With + this change the system administrator can now override the + "tmpfiles" config shipped by the package in + /usr/libtmpfiles.d. + - dh_installinit: Ditto. + + -- Seyeong Kim 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;