diff -Nru debhelper-13.3.4ubuntu1/debian/changelog debhelper-13.3.4ubuntu2/debian/changelog --- debhelper-13.3.4ubuntu1/debian/changelog 2021-03-19 12:29:56.000000000 +0000 +++ debhelper-13.3.4ubuntu2/debian/changelog 2021-08-04 19:23:25.000000000 +0100 @@ -1,3 +1,12 @@ +debhelper (13.3.4ubuntu2) impish; urgency=medium + + * objcopy/strip changed in 2.36.1, not keeping file attributes of the + original file. Work around that in dh_strip to write to a temporary + file, copying attributes, cat'ing this to the original file, copying + attributes again to keep the original attributes. LP: #1938886 + + -- Dimitri John Ledkov Wed, 04 Aug 2021 19:23:25 +0100 + debhelper (13.3.4ubuntu1) hirsute; urgency=medium * Merge with Debian; remaining changes: diff -Nru debhelper-13.3.4ubuntu1/dh_strip debhelper-13.3.4ubuntu2/dh_strip --- debhelper-13.3.4ubuntu1/dh_strip 2021-03-19 12:29:56.000000000 +0000 +++ debhelper-13.3.4ubuntu2/dh_strip 2021-08-04 19:23:25.000000000 +0100 @@ -337,7 +337,9 @@ my $tempfile; (undef, $tempfile) = File::Temp::tempfile("objcopyXXXXXX", DIR => $tempdir, OPEN => 0); doit($objcopy, "--add-gnu-debuglink", $debug_path, $file, $tempfile); + doit("chmod", "--reference", $file, $tempfile); complex_doit("cat '$tempfile' > '$file'"); + doit("chmod", "--reference", $tempfile, $file); } my %all_packages = map { $_ => 1 } getpackages(); @@ -387,7 +389,9 @@ my $tempfile; (undef, $tempfile) = File::Temp::tempfile("stripXXXXXX", DIR => $tempdir, OPEN => 0); doit($strip, "--remove-section=.comment", "--remove-section=.note", "--strip-unneeded", "-o", $tempfile, $_); + doit("chmod", "--reference", $_, $tempfile); complex_doit("cat '$tempfile' > '$_'"); + doit("chmod", "--reference", $tempfile, $_); attach_debug($objcopy, $_, $debug_path, $tempdir) if defined $debug_path; } @@ -396,7 +400,9 @@ my $tempfile; (undef, $tempfile) = File::Temp::tempfile("stripXXXXXX", DIR => $tempdir, OPEN => 0); doit($strip, "--remove-section=.comment", "--remove-section=.note", "-o", $tempfile, $_); + doit("chmod", "--reference", $_, $tempfile); complex_doit("cat '$tempfile' > '$_'"); + doit("chmod", "--reference", $tempfile, $_); attach_debug($objcopy, $_, $debug_path, $tempdir) if defined $debug_path; }