diff -Nru debhelper-13.14.1ubuntu4/debian/changelog debhelper-13.14.1ubuntu5/debian/changelog --- debhelper-13.14.1ubuntu4/debian/changelog 2024-03-01 03:33:14.000000000 +0000 +++ debhelper-13.14.1ubuntu5/debian/changelog 2024-03-01 04:50:27.000000000 +0000 @@ -1,20 +1,8 @@ -debhelper (13.14.1ubuntu4) noble; urgency=medium +debhelper (13.14.1ubuntu5) noble; urgency=medium - * Disable dwz harder + * Revert dwz bootstrapping hacks - -- Steve Langasek Fri, 01 Mar 2024 03:33:14 +0000 - -debhelper (13.14.1ubuntu3) noble; urgency=medium - - * Also temporarily drop dependency on debugedit for bootstrap. - - -- Steve Langasek Fri, 01 Mar 2024 03:17:13 +0000 - -debhelper (13.14.1ubuntu2) noble; urgency=medium - - * Temporarily drop dependency on dwz for bootstrap. - - -- Steve Langasek Fri, 01 Mar 2024 01:37:34 +0000 + -- Steve Langasek Fri, 01 Mar 2024 04:50:27 +0000 debhelper (13.14.1ubuntu1) noble; urgency=low diff -Nru debhelper-13.14.1ubuntu4/debian/control debhelper-13.14.1ubuntu5/debian/control --- debhelper-13.14.1ubuntu4/debian/control 2024-03-01 03:17:28.000000000 +0000 +++ debhelper-13.14.1ubuntu5/debian/control 2024-03-01 04:49:59.000000000 +0000 @@ -31,8 +31,8 @@ # dbgsym support landed in 1.18.0, 1.18.2 fixes a related nasty bug. dpkg (>= 1.18.0~), dpkg-dev (>= 1.18.2~), -# debugedit, -# dwz (>= 0.12.20190711), + debugedit, + dwz (>= 0.12.20190711), file (>= 3.23), libdebhelper-perl (= ${source:Version}), libdpkg-perl (>= 1.17.14), @@ -55,8 +55,7 @@ # fixes in the subsequent uploads. It is only needed for cross-building. # qt5-qmake (<< 5.9.2+dfsg-8), Suggests: dh-make, -#dh-sequence-dwz, -Provides: +Provides: dh-sequence-dwz, dh-sequence-elf-tools, dh-sequence-installinitramfs, dh-sequence-installsysusers, diff -Nru debhelper-13.14.1ubuntu4/dh_strip debhelper-13.14.1ubuntu5/dh_strip --- debhelper-13.14.1ubuntu4/dh_strip 2024-03-01 03:18:17.000000000 +0000 +++ debhelper-13.14.1ubuntu5/dh_strip 2024-03-01 04:49:59.000000000 +0000 @@ -297,7 +297,7 @@ return unless $file_info =~ /not stripped/; # set a uniqe build-id - #doit("debugedit", "--build-id", "--build-id-seed=$seed", $file); + doit("debugedit", "--build-id", "--build-id-seed=$seed", $file); $file_info = get_file_type($file, 0); # get changed build-id if ($use_build_id) { diff -Nru debhelper-13.14.1ubuntu4/lib/Debian/Debhelper/Sequence/elf_tools.pm debhelper-13.14.1ubuntu5/lib/Debian/Debhelper/Sequence/elf_tools.pm --- debhelper-13.14.1ubuntu4/lib/Debian/Debhelper/Sequence/elf_tools.pm 2024-03-01 03:33:01.000000000 +0000 +++ debhelper-13.14.1ubuntu5/lib/Debian/Debhelper/Sequence/elf_tools.pm 2024-03-01 04:49:59.000000000 +0000 @@ -5,10 +5,10 @@ use Debian::Debhelper::Dh_Lib qw(compat); insert_after('dh_missing', 'dh_strip'); -#if (not compat(11)) { -# insert_before('dh_strip', 'dh_dwz'); -#} +if (not compat(11)) { + insert_before('dh_strip', 'dh_dwz'); +} insert_after('dh_strip', 'dh_makeshlibs'); insert_after('dh_makeshlibs', 'dh_shlibdeps'); -1; +1; \ No newline at end of file diff -Nru debhelper-13.14.1ubuntu4/lib/Debian/Debhelper/Sequence/root_sequence.pm debhelper-13.14.1ubuntu5/lib/Debian/Debhelper/Sequence/root_sequence.pm --- debhelper-13.14.1ubuntu4/lib/Debian/Debhelper/Sequence/root_sequence.pm 2024-03-01 03:32:42.000000000 +0000 +++ debhelper-13.14.1ubuntu5/lib/Debian/Debhelper/Sequence/root_sequence.pm 2024-03-01 04:49:59.000000000 +0000 @@ -16,7 +16,7 @@ ); my @commands_controlled_by_deb_build_options = ( - $include_if_compat_X_or_newer->(13, ['dh_auto_test', 'nocheck'], ['dh_strip', 'nostrip']), + $include_if_compat_X_or_newer->(13, ['dh_auto_test', 'nocheck'], ['dh_dwz', 'nostrip'], ['dh_strip', 'nostrip']), ); my @bd_minimal = qw{ diff -Nru debhelper-13.14.1ubuntu4/man/po4a/po/de.po debhelper-13.14.1ubuntu5/man/po4a/po/de.po --- debhelper-13.14.1ubuntu4/man/po4a/po/de.po 2024-03-01 03:18:26.000000000 +0000 +++ debhelper-13.14.1ubuntu5/man/po4a/po/de.po 2024-03-01 04:50:27.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: debhelper 12.9\n" "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n" -"POT-Creation-Date: 2024-03-01 03:18+0000\n" +"POT-Creation-Date: 2024-03-01 04:50+0000\n" "PO-Revision-Date: 2023-01-11 22:00+0100\n" "Last-Translator: Erik Pfannenstein \n" "Language-Team: German \n" diff -Nru debhelper-13.14.1ubuntu4/man/po4a/po/debhelper.pot debhelper-13.14.1ubuntu5/man/po4a/po/debhelper.pot --- debhelper-13.14.1ubuntu4/man/po4a/po/debhelper.pot 2024-03-01 03:18:26.000000000 +0000 +++ debhelper-13.14.1ubuntu5/man/po4a/po/debhelper.pot 2024-03-01 04:50:27.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-03-01 03:18+0000\n" +"POT-Creation-Date: 2024-03-01 04:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru debhelper-13.14.1ubuntu4/man/po4a/po/es.po debhelper-13.14.1ubuntu5/man/po4a/po/es.po --- debhelper-13.14.1ubuntu4/man/po4a/po/es.po 2024-03-01 03:18:26.000000000 +0000 +++ debhelper-13.14.1ubuntu5/man/po4a/po/es.po 2024-03-01 04:50:27.000000000 +0000 @@ -31,7 +31,7 @@ msgstr "" "Project-Id-Version: debhelper 9.20120609\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-01 03:18+0000\n" +"POT-Creation-Date: 2024-03-01 04:50+0000\n" "PO-Revision-Date: 2012-08-20 11:17+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" diff -Nru debhelper-13.14.1ubuntu4/man/po4a/po/fr.po debhelper-13.14.1ubuntu5/man/po4a/po/fr.po --- debhelper-13.14.1ubuntu4/man/po4a/po/fr.po 2024-03-01 03:18:26.000000000 +0000 +++ debhelper-13.14.1ubuntu5/man/po4a/po/fr.po 2024-03-01 04:50:27.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper manpages\n" -"POT-Creation-Date: 2024-03-01 03:18+0000\n" +"POT-Creation-Date: 2024-03-01 04:50+0000\n" "PO-Revision-Date: 2021-02-13 10:02+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" diff -Nru debhelper-13.14.1ubuntu4/man/po4a/po/ja.po debhelper-13.14.1ubuntu5/man/po4a/po/ja.po --- debhelper-13.14.1ubuntu4/man/po4a/po/ja.po 2024-03-01 03:18:27.000000000 +0000 +++ debhelper-13.14.1ubuntu5/man/po4a/po/ja.po 2024-03-01 04:50:27.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: debhelper 9.20141107\n" -"POT-Creation-Date: 2024-03-01 03:18+0000\n" +"POT-Creation-Date: 2024-03-01 04:50+0000\n" "PO-Revision-Date: 2016-09-17 20:45+0900\n" "Last-Translator: Hideki Yamane \n" "Language-Team: Debian JP Project \n" diff -Nru debhelper-13.14.1ubuntu4/man/po4a/po/pt.po debhelper-13.14.1ubuntu5/man/po4a/po/pt.po --- debhelper-13.14.1ubuntu4/man/po4a/po/pt.po 2024-03-01 03:18:27.000000000 +0000 +++ debhelper-13.14.1ubuntu5/man/po4a/po/pt.po 2024-03-01 04:50:27.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: debhelper 13.11.4\n" "Report-Msgid-Bugs-To: debhelper@packages.debian.org\n" -"POT-Creation-Date: 2024-03-01 03:18+0000\n" +"POT-Creation-Date: 2024-03-01 04:50+0000\n" "PO-Revision-Date: 2023-01-07 22:34+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese <>\n"