Merging upstream version 1.22.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

33 files changed, 645 insertions, 337 deletions

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 5b53655..6c2a189 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -180,13 +180,11 @@ sub parse_features {
             my $value = ($1 eq '+') ? 1 : 0;
             if ($feature eq 'all') {
                 $use_feature->{$_} = $value foreach keys %{$use_feature};
+            } elsif (exists $use_feature->{$feature}) {
+                $use_feature->{$feature} = $value;
             } else {
-                if (exists $use_feature->{$feature}) {
-                    $use_feature->{$feature} = $value;
-                } else {
-                    warning(g_('unknown %s feature in %s variable: %s'),
-                            $option, $self->{envvar}, $feature);
-                }
+                warning(g_('unknown %s feature in %s variable: %s'),
+                        $option, $self->{envvar}, $feature);
             }
         } else {
             warning(g_('incorrect value in %s option of %s variable: %s'),
diff --git a/scripts/Dpkg/Changelog/Entry.pm b/scripts/Dpkg/Changelog/Entry.pm
index e572909..d55e5fd 100644
--- a/scripts/Dpkg/Changelog/Entry.pm
+++ b/scripts/Dpkg/Changelog/Entry.pm
@@ -154,16 +154,14 @@ sub extend_part {
 	} else {
 	    push @{$self->{$part}}, $value;
 	}
+    } elsif (defined $self->{$part}) {
+        if (ref($value)) {
+            $self->{$part} = [ $self->{$part}, @$value ];
+        } else {
+            $self->{$part} .= $value;
+        }
     } else {
-	if (defined($self->{$part})) {
-	    if (ref($value)) {
-		$self->{$part} = [ $self->{$part}, @$value ];
-	    } else {
-		$self->{$part} .= $value;
-	    }
-	} else {
-	    $self->{$part} = $value;
-	}
+        $self->{$part} = $value;
     }
 }
 
diff --git a/scripts/Dpkg/Deps/Simple.pm b/scripts/Dpkg/Deps/Simple.pm
index a2ab2b1..e4888ed 100644
--- a/scripts/Dpkg/Deps/Simple.pm
+++ b/scripts/Dpkg/Deps/Simple.pm
@@ -438,12 +438,10 @@ sub implies {
             if (defined $implication) {
                 if (not defined $res) {
                     $res = $implication;
+                } elsif ($implication) {
+                    $res = 1;
                 } else {
-                    if ($implication) {
-                        $res = 1;
-                    } else {
-                        $res = 0;
-                    }
+                    $res = 0;
                 }
                 last if defined $res and $res == 1;
             }
diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm
index 9c53ef1..6c834be 100644
--- a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm
+++ b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm
@@ -46,7 +46,7 @@ use Dpkg::OpenPGP::ErrorCodes;
 use parent qw(Dpkg::OpenPGP::Backend);
 
 sub DEFAULT_CMDV {
-    return [ qw(gpgv) ];
+    return [ qw(gpgv-sq gpgv) ];
 }
 
 sub DEFAULT_CMDSTORE {
@@ -54,7 +54,7 @@ sub DEFAULT_CMDSTORE {
 }
 
 sub DEFAULT_CMD {
-    return [ qw(gpg) ];
+    return [ qw(gpg-sq gpg) ];
 }
 
 sub has_backend_cmd {
diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
index ae4acc1..36801c9 100644
--- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
+++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm
@@ -69,7 +69,7 @@ sub armor
     return OPENPGP_MISSING_CMD unless $self->{cmd};
 
     # We ignore the $type, and let "sq" handle this automatically.
-    my $rc = $self->_sq_exec(qw(armor --output), $out, $in);
+    my $rc = $self->_sq_exec(qw(toolbox armor --output), $out, $in);
     return OPENPGP_BAD_DATA if $rc;
     return OPENPGP_OK;
 }
@@ -81,7 +81,7 @@ sub dearmor
     return OPENPGP_MISSING_CMD unless $self->{cmd};
 
     # We ignore the $type, and let "sq" handle this automatically.
-    my $rc = $self->_sq_exec(qw(dearmor --output), $out, $in);
+    my $rc = $self->_sq_exec(qw(toolbox dearmor --output), $out, $in);
     return OPENPGP_BAD_DATA if $rc;
     return OPENPGP_OK;
 }
diff --git a/scripts/Dpkg/Shlibs/Symbol.pm b/scripts/Dpkg/Shlibs/Symbol.pm
index f4955bb..3b38a8c 100644
--- a/scripts/Dpkg/Shlibs/Symbol.pm
+++ b/scripts/Dpkg/Shlibs/Symbol.pm
@@ -115,23 +115,19 @@ sub parse_symbolspec {
 	    $symbol_templ = $2;
 	    $symbol = $2;
 	    $rest = $3;
-	} else {
-	    if ($symbol =~ m/^(\S+)(.*)$/) {
-		$symbol_templ = $1;
-		$symbol = $1;
-		$rest = $2;
-	    }
+	} elsif ($symbol =~ m/^(\S+)(.*)$/) {
+            $symbol_templ = $1;
+            $symbol = $1;
+            $rest = $2;
 	}
 	error(g_('symbol name unspecified: %s'), $symbolspec) if (!$symbol);
-    } else {
+    } elsif ($symbolspec =~ m/^(\S+)(.*)$/) {
 	# No tag specification. Symbol name is up to the first space
 	# foobarsymbol@Base 1.0 1
-	if ($symbolspec =~ m/^(\S+)(.*)$/) {
-	    $symbol = $1;
-	    $rest = $2;
-	} else {
-	    return 0;
-	}
+        $symbol = $1;
+        $rest = $2;
+    } else {
+        return 0;
     }
     $self->{symbol} = $symbol;
     $self->{symbol_templ} = $symbol_templ;
@@ -463,12 +459,10 @@ sub mark_found_in_library {
 	# Symbol reappeared somehow
 	$self->{deprecated} = 0;
 	$self->{minver} = $minver if (not $self->is_optional());
-    } else {
+    } elsif (version_compare($minver, $self->{minver}) < 0) {
 	# We assume that the right dependency information is already
 	# there.
-	if (version_compare($minver, $self->{minver}) < 0) {
-	    $self->{minver} = $minver;
-	}
+        $self->{minver} = $minver;
     }
     # Never remove arch tags from patterns
     if (not $self->is_pattern()) {
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index 170ffe1..bdf2c87 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -347,18 +347,16 @@ sub do_build {
 	# creating a native .tar.gz
 	if ($origtargz) {
 	    $sourcestyle =~ y/aA/pP/; # .orig.tar.<ext>
-	} else {
-	    if (stat($origdir)) {
-		unless (-d _) {
-                    error(g_("unpacked orig '%s' exists but is not a directory"),
-		          $origdir);
-                }
-		$sourcestyle =~ y/aA/rR/; # .orig directory
-	    } elsif ($! != ENOENT) {
-		syserr(g_("unable to stat putative unpacked orig '%s'"), $origdir);
-	    } else {
-		$sourcestyle =~ y/aA/nn/; # Native tar.gz
-	    }
+        } elsif (stat($origdir)) {
+            unless (-d _) {
+                error(g_("unpacked orig '%s' exists but is not a directory"),
+                      $origdir);
+            }
+            $sourcestyle =~ y/aA/rR/; # .orig directory
+        } elsif ($! != ENOENT) {
+            syserr(g_("unable to stat putative unpacked orig '%s'"), $origdir);
+        } else {
+            $sourcestyle =~ y/aA/nn/; # Native tar.gz
 	}
     }
 
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 2d07794..fcf5b1e 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -79,7 +79,7 @@ sub run_hook {
 	}
     } elsif ($hook eq 'update-buildflags') {
         $self->set_build_features(@params);
-        $self->_add_build_flags(@params);
+        $self->add_build_flags(@params);
     } elsif ($hook eq 'builtin-system-build-paths') {
         return qw(/build/);
     } elsif ($hook eq 'build-tainted-by') {
@@ -113,7 +113,8 @@ sub set_build_features {
             # XXX: This is set to undef so that we can handle the alias from
             # the future feature area.
             lfs => undef,
-            time64 => 0,
+            # XXX: This is set to undef to handle mask on the default setting.
+            time64 => undef,
         },
         qa => {
             bug => 0,
@@ -270,9 +271,36 @@ sub set_build_features {
 
     ## Area: abi
 
+    if (any { $arch eq $_ } qw(hurd-i386 kfreebsd-i386)) {
+        # Mask time64 on hurd-i386 and kfreebsd-i386, as their kernel lacks
+        # support for that arch and it will not be implemented.
+        $use_feature{abi}{time64} = 0;
+    } elsif (not defined $use_feature{abi}{time64}) {
+        # If the user has not requested a specific setting, by default only
+        # enable time64 everywhere except for i386, where we preserve it for
+        # binary backwards compatibility.
+        if ($arch eq 'i386') {
+            $use_feature{abi}{time64} = 0;
+        } else {
+            $use_feature{abi}{time64} = 1;
+        }
+    }
+
+    # In Debian gcc enables time64 (and lfs) for the following architectures
+    # by injecting pre-processor flags, though the libc ABI has not changed.
+    if (any { $arch eq $_ } qw(armel armhf hppa m68k mips mipsel powerpc sh4)) {
+        $flags->set_option_value('cc-abi-time64', 1);
+    } else {
+        $flags->set_option_value('cc-abi-time64', 0);
+    }
+
     if ($use_feature{abi}{time64} && ! $builtin_feature{abi}{time64}) {
         # On glibc 64-bit time_t support requires LFS.
         $use_feature{abi}{lfs} = 1 if $libc eq 'gnu';
+
+        # Require -Werror=implicit-function-declaration, to avoid linking
+        # against the wrong symbol.
+        $use_feature{qa}{'bug-implicit-func'} = 1;
     }
 
     # XXX: Handle lfs alias from future abi feature area.
@@ -392,7 +420,7 @@ sub set_build_features {
     }
 }
 
-sub _add_build_flags {
+sub add_build_flags {
     my ($self, $flags) = @_;
 
     ## Global default flags
@@ -425,13 +453,22 @@ sub _add_build_flags {
     ## Area: abi
 
     my %abi_builtins = $flags->get_builtins('abi');
+    my $cc_abi_time64 = $flags->get_option_value('cc-abi-time64');
+
     if ($flags->use_feature('abi', 'lfs') && ! $abi_builtins{lfs}) {
         $flags->append('CPPFLAGS',
                        '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+    } elsif (! $flags->use_feature('abi', 'lfs') &&
+             ! $abi_builtins{lfs} && $cc_abi_time64) {
+        $flags->append('CPPFLAGS',
+                       '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
     }
 
     if ($flags->use_feature('abi', 'time64') && ! $abi_builtins{time64}) {
         $flags->append('CPPFLAGS', '-D_TIME_BITS=64');
+    } elsif (! $flags->use_feature('abi', 'time64') &&
+             ! $abi_builtins{time64} && $cc_abi_time64) {
+        $flags->append('CPPFLAGS', '-U_TIME_BITS');
     }
 
     ## Area: qa
@@ -586,7 +623,11 @@ sub _add_build_flags {
         } elsif ($cpu eq 'amd64') {
             $flag = '-fcf-protection';
         }
-        $flags->append($_, $flag) foreach @compile_flags;
+        # The following should always be true on Debian, but it might not
+        # be on derivatives.
+        if (defined $flag) {
+            $flags->append($_, $flag) foreach @compile_flags;
+        }
     }
 }
 
diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm
index fc0e6be..934953f 100644
--- a/scripts/Dpkg/Vendor/Default.pm
+++ b/scripts/Dpkg/Vendor/Default.pm
@@ -218,6 +218,19 @@ sub set_build_features {
     return;
 }
 
+=item $vendor->add_build_flags($flags)
+
+Adds the vendor build flags to the compiler flag variables based on the
+vendor defaults and previously set build features.
+
+=cut
+
+sub add_build_flags {
+    my ($self, $flags) = @_;
+
+    return;
+}
+
 =back
 
 =head1 CHANGES
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index b50da37..f907fa9 100644
--- a/scripts/Dpkg/Vendor/Ubuntu.pm
+++ b/scripts/Dpkg/Vendor/Ubuntu.pm
@@ -95,14 +95,6 @@ sub run_hook {
         if (scalar(@$bugs)) {
             $fields->{'Launchpad-Bugs-Fixed'} = join(' ', @$bugs);
         }
-    } elsif ($hook eq 'update-buildflags') {
-	my $flags = shift @params;
-
-        # Run the Debian hook to add hardening flags
-        $self->SUPER::run_hook($hook, $flags);
-
-	# Per https://wiki.ubuntu.com/DistCompilerFlags
-        $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions');
     } else {
         return $self->SUPER::run_hook($hook, @params);
     }
@@ -137,6 +129,64 @@ sub set_build_features {
     $flags->set_option_value('fortify-level', 3);
 }
 
+sub add_build_flags {
+    my ($self, $flags) = @_;
+
+    my @compile_flags = qw(
+        CFLAGS
+        CXXFLAGS
+        OBJCFLAGS
+        OBJCXXFLAGS
+        FFLAGS
+        FCFLAGS
+    );
+
+    $self->SUPER::add_build_flags($flags);
+
+    # Per https://wiki.ubuntu.com/DistCompilerFlags
+    $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions');
+
+    # In Ubuntu these flags are set by the compiler, so when disabling the
+    # features we need to pass appropriate flags to disable them.
+    if (!$flags->use_feature('hardening', 'stackprotectorstrong') &&
+        !$flags->use_feature('hardening', 'stackprotector')) {
+        my $flag = '-fno-stack-protector';
+        $flags->append($_, $flag) foreach @compile_flags;
+    }
+
+    if (!$flags->use_feature('hardening', 'stackclash')) {
+        my $flag = '-fno-stack-clash-protection';
+        $flags->append($_, $flag) foreach @compile_flags;
+    }
+
+    if (!$flags->use_feature('hardening', 'fortify')) {
+        $flags->append('CPPFLAGS', '-D_FORTIFY_SOURCE=0');
+    }
+
+    if (!$flags->use_feature('hardening', 'format')) {
+        my $flag = '-Wno-format -Wno-error=format-security';
+        $flags->append('CFLAGS', $flag);
+        $flags->append('CXXFLAGS', $flag);
+        $flags->append('OBJCFLAGS', $flag);
+        $flags->append('OBJCXXFLAGS', $flag);
+     }
+
+     if (!$flags->use_feature('hardening', 'branch')) {
+        my $cpu = $flags->get_option_value('hardening-branch-cpu');
+        my $flag;
+        if ($cpu eq 'arm64') {
+            $flag = '-mbranch-protection=none';
+        } elsif ($cpu eq 'amd64') {
+            $flag = '-fno-cf-protection';
+        }
+        if (defined $flag) {
+            $flags->append($_, $flag) foreach @compile_flags;
+        }
+    }
+
+    return;
+}
+
 =head1 PUBLIC FUNCTIONS
 
 =over
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1cec205..8d39d24 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,68 +2,9 @@
 
 SUBDIRS = mk po
 
-sbin_SCRIPTS = \
-	dpkg-fsys-usrunmess \
-	# EOL
-
-bin_SCRIPTS = \
-	dpkg-architecture \
-	dpkg-buildflags \
-	dpkg-buildapi \
-	dpkg-buildpackage \
-	dpkg-buildtree \
-	dpkg-checkbuilddeps \
-	dpkg-distaddfile \
-	dpkg-genbuildinfo \
-	dpkg-genchanges \
-	dpkg-gencontrol \
-	dpkg-gensymbols \
-	dpkg-mergechangelogs \
-	dpkg-name \
-	dpkg-parsechangelog \
-	dpkg-scanpackages \
-	dpkg-scansources \
-	dpkg-shlibdeps \
-	dpkg-source \
-	dpkg-vendor \
-	# EOL
+EXTRA_DIST =
+CLEANFILES =
 
-EXTRA_DIST = \
-	dpkg-architecture.pl \
-	dpkg-buildapi.pl \
-	dpkg-buildflags.pl \
-	dpkg-buildpackage.pl \
-	dpkg-buildtree.pl \
-	dpkg-checkbuilddeps.pl \
-	dpkg-distaddfile.pl \
-	dpkg-fsys-usrunmess.pl \
-	dpkg-genbuildinfo.pl \
-	dpkg-genchanges.pl \
-	dpkg-gencontrol.pl \
-	dpkg-gensymbols.pl \
-	dpkg-mergechangelogs.pl \
-	dpkg-name.pl \
-	dpkg-parsechangelog.pl \
-	dpkg-scanpackages.pl \
-	dpkg-scansources.pl \
-	dpkg-shlibdeps.pl \
-	dpkg-source.pl \
-	dpkg-vendor.pl \
-	$(test_scripts) \
-	$(test_data) \
-	# EOL
-
-dist_zshcompletions_DATA = \
-	completion/zsh/_dpkg-parsechangelog \
-	# EOL
-
-CLEANFILES = \
-	$(test_data_objects) \
-	$(sbin_SCRIPTS) \
-	$(bin_SCRIPTS) \
-	# EOL
-
-perllibdir = $(PERL_LIBDIR)
 nobase_dist_perllib_DATA = \
 	Dpkg/Arch.pm \
 	Dpkg/BuildAPI.pm \
@@ -156,6 +97,67 @@ EXTRA_DIST += \
 	Test/Dpkg.pm \
 	# EOL
 
+sbin_SCRIPTS = \
+	dpkg-fsys-usrunmess \
+	# EOL
+
+bin_SCRIPTS = \
+	dpkg-architecture \
+	dpkg-buildflags \
+	dpkg-buildapi \
+	dpkg-buildpackage \
+	dpkg-buildtree \
+	dpkg-checkbuilddeps \
+	dpkg-distaddfile \
+	dpkg-genbuildinfo \
+	dpkg-genchanges \
+	dpkg-gencontrol \
+	dpkg-gensymbols \
+	dpkg-mergechangelogs \
+	dpkg-name \
+	dpkg-parsechangelog \
+	dpkg-scanpackages \
+	dpkg-scansources \
+	dpkg-shlibdeps \
+	dpkg-source \
+	dpkg-vendor \
+	# EOL
+
+EXTRA_DIST += \
+	dpkg-architecture.pl \
+	dpkg-buildapi.pl \
+	dpkg-buildflags.pl \
+	dpkg-buildpackage.pl \
+	dpkg-buildtree.pl \
+	dpkg-checkbuilddeps.pl \
+	dpkg-distaddfile.pl \
+	dpkg-fsys-usrunmess.pl \
+	dpkg-genbuildinfo.pl \
+	dpkg-genchanges.pl \
+	dpkg-gencontrol.pl \
+	dpkg-gensymbols.pl \
+	dpkg-mergechangelogs.pl \
+	dpkg-name.pl \
+	dpkg-parsechangelog.pl \
+	dpkg-scanpackages.pl \
+	dpkg-scansources.pl \
+	dpkg-shlibdeps.pl \
+	dpkg-source.pl \
+	dpkg-vendor.pl \
+	# EOL
+
+CLEANFILES += \
+	$(sbin_SCRIPTS) \
+	$(bin_SCRIPTS) \
+	# EOL
+
+dist_bashcompletions_DATA = \
+	# EOL
+
+dist_zshcompletions_DATA = \
+	completion/zsh/_dpkg-parsechangelog \
+	# EOL
+
 # Keep it even if empty to have man3dir correctly set
 man3_MANS =
 
@@ -422,6 +424,11 @@ test_data = \
 	t/origins/ubuntu \
 	# EOL
 
+EXTRA_DIST += \
+	$(test_scripts) \
+	$(test_data) \
+	# EOL
+
 test_data_objects = \
 	t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \
 	t/Dpkg_Shlibs/libobjdump.basictags-i386.so \
@@ -430,6 +437,10 @@ test_data_objects = \
 	t/Dpkg_Shlibs/libobjdump.spacesyms.so \
 	# EOL
 
+CLEANFILES += \
+	$(test_data_objects) \
+	# EOL
+
 $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
 	  -DAMD64 -o $@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c0d7c6d..8b0a61f 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -127,8 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_zshcompletions_DATA) \
-	$(nobase_dist_perllib_DATA) $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcompletions_DATA) \
+	$(dist_zshcompletions_DATA) $(nobase_dist_perllib_DATA) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = Build.PL README.cpan
@@ -161,8 +162,8 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
-	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(zshcompletionsdir)" \
-	"$(DESTDIR)$(perllibdir)"
+	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(bashcompletionsdir)" \
+	"$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"
 SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -194,7 +195,8 @@ am__can_run_installinfo = \
 man3dir = $(mandir)/man3
 NROFF = nroff
 MANS = $(man3_MANS)
-DATA = $(dist_zshcompletions_DATA) $(nobase_dist_perllib_DATA)
+DATA = $(dist_bashcompletions_DATA) $(dist_zshcompletions_DATA) \
+	$(nobase_dist_perllib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -393,6 +395,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aclocaldir = @aclocaldir@
 admindir = @admindir@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -400,6 +403,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 backupsdir = @backupsdir@
+bashcompletionsdir = @bashcompletionsdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -411,6 +415,7 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 devlibdir = @devlibdir@
 docdir = @docdir@
+docspecdir = @docspecdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -428,10 +433,14 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 logdir = @logdir@
 mandir = @mandir@
+methodsdir = @methodsdir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+perllibdir = @perllibdir@
 pkgconfdir = @pkgconfdir@
+pkgconfigdir = @pkgconfigdir@
+polkitactionsdir = @polkitactionsdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -446,51 +455,15 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zshcompletionsdir = @zshcompletionsdir@
 SUBDIRS = mk po
-sbin_SCRIPTS = \
-	dpkg-fsys-usrunmess \
-	# EOL
-
-bin_SCRIPTS = \
-	dpkg-architecture \
-	dpkg-buildflags \
-	dpkg-buildapi \
-	dpkg-buildpackage \
-	dpkg-buildtree \
-	dpkg-checkbuilddeps \
-	dpkg-distaddfile \
-	dpkg-genbuildinfo \
-	dpkg-genchanges \
-	dpkg-gencontrol \
-	dpkg-gensymbols \
-	dpkg-mergechangelogs \
-	dpkg-name \
-	dpkg-parsechangelog \
-	dpkg-scanpackages \
-	dpkg-scansources \
-	dpkg-shlibdeps \
-	dpkg-source \
-	dpkg-vendor \
-	# EOL
-
-EXTRA_DIST = dpkg-architecture.pl dpkg-buildapi.pl dpkg-buildflags.pl \
-	dpkg-buildpackage.pl dpkg-buildtree.pl dpkg-checkbuilddeps.pl \
-	dpkg-distaddfile.pl dpkg-fsys-usrunmess.pl \
-	dpkg-genbuildinfo.pl dpkg-genchanges.pl dpkg-gencontrol.pl \
-	dpkg-gensymbols.pl dpkg-mergechangelogs.pl dpkg-name.pl \
-	dpkg-parsechangelog.pl dpkg-scanpackages.pl \
+EXTRA_DIST = Test/Dpkg.pm dpkg-architecture.pl dpkg-buildapi.pl \
+	dpkg-buildflags.pl dpkg-buildpackage.pl dpkg-buildtree.pl \
+	dpkg-checkbuilddeps.pl dpkg-distaddfile.pl \
+	dpkg-fsys-usrunmess.pl dpkg-genbuildinfo.pl dpkg-genchanges.pl \
+	dpkg-gencontrol.pl dpkg-gensymbols.pl dpkg-mergechangelogs.pl \
+	dpkg-name.pl dpkg-parsechangelog.pl dpkg-scanpackages.pl \
 	dpkg-scansources.pl dpkg-shlibdeps.pl dpkg-source.pl \
-	dpkg-vendor.pl $(test_scripts) $(test_data) Test/Dpkg.pm # EOL
-dist_zshcompletions_DATA = \
-	completion/zsh/_dpkg-parsechangelog \
-	# EOL
-
-CLEANFILES = \
-	$(test_data_objects) \
-	$(sbin_SCRIPTS) \
-	$(bin_SCRIPTS) \
-	# EOL
-
-perllibdir = $(PERL_LIBDIR)
+	dpkg-vendor.pl $(test_scripts) $(test_data) # EOL
+CLEANFILES = $(sbin_SCRIPTS) $(bin_SCRIPTS) $(test_data_objects) # EOL
 nobase_dist_perllib_DATA = \
 	Dpkg/Arch.pm \
 	Dpkg/BuildAPI.pm \
@@ -579,6 +552,39 @@ nobase_dist_perllib_DATA = \
 	Dpkg.pm \
 	# EOL
 
+sbin_SCRIPTS = \
+	dpkg-fsys-usrunmess \
+	# EOL
+
+bin_SCRIPTS = \
+	dpkg-architecture \
+	dpkg-buildflags \
+	dpkg-buildapi \
+	dpkg-buildpackage \
+	dpkg-buildtree \
+	dpkg-checkbuilddeps \
+	dpkg-distaddfile \
+	dpkg-genbuildinfo \
+	dpkg-genchanges \
+	dpkg-gencontrol \
+	dpkg-gensymbols \
+	dpkg-mergechangelogs \
+	dpkg-name \
+	dpkg-parsechangelog \
+	dpkg-scanpackages \
+	dpkg-scansources \
+	dpkg-shlibdeps \
+	dpkg-source \
+	dpkg-vendor \
+	# EOL
+
+dist_bashcompletions_DATA = \
+	# EOL
+
+dist_zshcompletions_DATA = \
+	completion/zsh/_dpkg-parsechangelog \
+	# EOL
+
 
 # Keep it even if empty to have man3dir correctly set
 man3_MANS = 
@@ -988,6 +994,27 @@ uninstall-man3:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
+install-dist_bashcompletionsDATA: $(dist_bashcompletions_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletionsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bashcompletionsdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompletionsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletionsdir)" || exit $$?; \
+	done
+
+uninstall-dist_bashcompletionsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(bashcompletionsdir)'; $(am__uninstall_files_from_dir)
 install-dist_zshcompletionsDATA: $(dist_zshcompletions_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_zshcompletions_DATA)'; test -n "$(zshcompletionsdir)" || list=; \
@@ -1196,7 +1223,7 @@ check: check-recursive
 all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(bashcompletionsdir)" "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -1250,8 +1277,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-dist_zshcompletionsDATA \
-	install-man install-nobase_dist_perllibDATA
+install-data-am: install-data-local install-dist_bashcompletionsDATA \
+	install-dist_zshcompletionsDATA install-man \
+	install-nobase_dist_perllibDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -1296,9 +1324,10 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-dist_zshcompletionsDATA \
-	uninstall-local uninstall-man \
-	uninstall-nobase_dist_perllibDATA uninstall-sbinSCRIPTS
+uninstall-am: uninstall-binSCRIPTS uninstall-dist_bashcompletionsDATA \
+	uninstall-dist_zshcompletionsDATA uninstall-local \
+	uninstall-man uninstall-nobase_dist_perllibDATA \
+	uninstall-sbinSCRIPTS
 
 uninstall-man: uninstall-man3
 
@@ -1312,6 +1341,7 @@ uninstall-man: uninstall-man3
 	dvi-am html html-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am \
 	install-data-hook install-data-local \
+	install-dist_bashcompletionsDATA \
 	install-dist_zshcompletionsDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man3 \
@@ -1321,6 +1351,7 @@ uninstall-man: uninstall-man3
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-dist_bashcompletionsDATA \
 	uninstall-dist_zshcompletionsDATA uninstall-local \
 	uninstall-man uninstall-man3 uninstall-nobase_dist_perllibDATA \
 	uninstall-sbinSCRIPTS
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index 54f494c..1632ad8 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -200,6 +200,7 @@ sub test_needs_command
 sub test_needs_openpgp_backend
 {
     my @backends = qw(
+        gpg-sq
         gpg
         sq
         sqop
diff --git a/scripts/dpkg-buildapi.pl b/scripts/dpkg-buildapi.pl
index b34bcf5..2981eeb 100755
--- a/scripts/dpkg-buildapi.pl
+++ b/scripts/dpkg-buildapi.pl
@@ -36,12 +36,14 @@ sub version()
 sub usage()
 {
     printf g_(
-'Usage: %s [<option>...]')
+'Usage: %s [<option>...] [<command>]')
+    . "\n\n" . g_(
+'Commands:
+  -?, --help               show this help message.
+      --version            show the version.')
     . "\n\n" . g_(
 'Options:
   -c<control-file>         get control info from this file.
-  -?, --help               show this help message.
-  -v, --version            show the version.
 '), $Dpkg::PROGNAME;
 }
 
@@ -52,7 +54,7 @@ while (@ARGV) {
     if (m/^-\?|--help$/) {
         usage();
         exit 0;
-    } elsif (m/^-v|--version$/) {
+    } elsif (m/^--version$/) {
         version();
         exit 0;
     } elsif (m/-c(.*)$/) {
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 5c75014..f6d7879 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -116,13 +116,14 @@ my @b = reverse @$chb;
 my @result; # Lines to output
 my $exitcode = 0; # 1 if conflict encountered
 
-unless (merge_block($cho, $cha, $chb, sub {
-			my $changes = shift;
-			my $tail = $changes->get_unparsed_tail();
-			chomp $tail if defined $tail;
-			return $tail;
-		    }))
-{
+sub merge_tail {
+    my $changes = shift;
+    my $tail = $changes->get_unparsed_tail();
+    chomp $tail if defined $tail;
+    return $tail;
+};
+
+unless (merge_block($cho, $cha, $chb, \&merge_tail)) {
     merge_conflict($cha->get_unparsed_tail(), $chb->get_unparsed_tail());
 }
 
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 96c0b0b..240b0bc 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -133,15 +133,13 @@ foreach (@ARGV) {
 	push @exclude, $1;
     } elsif (m/^-/) {
 	usageerr(g_("unknown option '%s'"), $_);
+    } elsif (exists $exec{$_}) {
+        # Affect the binary to the most important field
+        if ($depstrength{$dependencyfield} > $depstrength{$exec{$_}}) {
+           $exec{$_} = $dependencyfield;
+        }
     } else {
-	if (exists $exec{$_}) {
-	    # Affect the binary to the most important field
-	    if ($depstrength{$dependencyfield} > $depstrength{$exec{$_}}) {
-		$exec{$_} = $dependencyfield;
-	    }
-	} else {
-	    $exec{$_} = $dependencyfield;
-	}
+        $exec{$_} = $dependencyfield;
     }
 }
 usageerr(g_('need at least one executable')) unless scalar keys %exec;
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 664f39c..c27a954 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -482,12 +482,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
     unless ($options{no_check}) {
         if ($srcpkg->is_signed()) {
             $srcpkg->check_signature();
+        } elsif ($options{require_valid_signature}) {
+            error(g_("%s doesn't contain a valid OpenPGP signature"), $dsc);
         } else {
-            if ($options{require_valid_signature}) {
-                error(g_("%s doesn't contain a valid OpenPGP signature"), $dsc);
-            } else {
-                warning(g_('extracting unsigned source package (%s)'), $dsc);
-            }
+            warning(g_('extracting unsigned source package (%s)'), $dsc);
         }
         $srcpkg->check_checksums();
     }
diff --git a/scripts/mk/Makefile.in b/scripts/mk/Makefile.in
index 9860f84..65e8fd5 100644
--- a/scripts/mk/Makefile.in
+++ b/scripts/mk/Makefile.in
@@ -316,6 +316,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aclocaldir = @aclocaldir@
 admindir = @admindir@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -323,6 +324,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 backupsdir = @backupsdir@
+bashcompletionsdir = @bashcompletionsdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -334,6 +336,7 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 devlibdir = @devlibdir@
 docdir = @docdir@
+docspecdir = @docspecdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -351,10 +354,14 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 logdir = @logdir@
 mandir = @mandir@
+methodsdir = @methodsdir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+perllibdir = @perllibdir@
 pkgconfdir = @pkgconfdir@
+pkgconfigdir = @pkgconfigdir@
+polkitactionsdir = @polkitactionsdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
diff --git a/scripts/po/ca.gmo b/scripts/po/ca.gmo
index ea32c18..5a91b73 100644
--- a/scripts/po/ca.gmo
+++ b/scripts/po/ca.gmo
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index dbb2140..6338f4a 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.21.18\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2023-12-17 20:30+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgstr ""
 "Aquest és programari lliure; vegeu la Llicència Pública General GNU versió 2 "
 "o posterior per a les condicions de còpia. NO hi ha garantia.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Forma d'ús: %s [<opció>…] [<ordre>]"
@@ -193,20 +193,17 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "no es pot executar %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Forma d'ús: %s [<opció>…]"
-
 #: scripts/dpkg-buildapi.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -?, --help               show this help message.\n"
+#| "  -v, --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Opcions:\n"
 "  -c<fitxer-control>       fitxer d'informació de control.\n"
@@ -214,6 +211,12 @@ msgstr ""
 "  -v, --version            mostra la versió.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 msgid "no arguments accepted"
 msgstr "no s'accepten arguments"
 
@@ -278,6 +281,13 @@ msgstr "s'ha especificat dos ordres: --%s i --%s"
 msgid "%s needs a parameter"
 msgstr "%s requereix un paràmetre"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Forma d'ús: %s [<opció>…]"
+
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options:\n"
diff --git a/scripts/po/de.gmo b/scripts/po/de.gmo
index 45d753c..7784da5 100644
--- a/scripts/po/de.gmo
+++ b/scripts/po/de.gmo
diff --git a/scripts/po/de.po b/scripts/po/de.po
index e896bdb..6cbd867 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-dev 1.22.3\n"
+"Project-Id-Version: dpkg-dev 1.22.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
-"PO-Revision-Date: 2024-01-06 18:27+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
+"PO-Revision-Date: 2024-01-25 17:45+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -44,7 +44,7 @@ msgstr ""
 "Dies ist freie Software. Lesen Sie die GNU General Public License Version 2\n"
 "oder neuer für die Kopierbedingungen. Es gibt KEINE Haftung.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Aufruf: %s [<Option> …] [<Befehl>]"
@@ -186,25 +186,23 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "%s konnte nicht ausgeführt werden"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Aufruf: %s [<Option> …]"
+#: scripts/dpkg-buildapi.pl
+msgid ""
+"Commands:\n"
+"  -?, --help               show this help message.\n"
+"      --version            show the version."
+msgstr ""
+"Befehle:\n"
+"  -?, --help               diese Hilfemeldung anzeigen\n"
+"      --version            die Version anzeigen"
 
 #: scripts/dpkg-buildapi.pl
 msgid ""
 "Options:\n"
 "  -c<control-file>         get control info from this file.\n"
-"  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
 msgstr ""
-"Optionen:\n"
+"Options:\n"
 "  -c<Steuerdatei>          Steuerinformationen aus dieser Datei erhalten\n"
-"  -?, --help               diese Hilfemeldung anzeigen\n"
-"  -v, --version            die Version anzeigen\n"
 
 #: scripts/dpkg-buildapi.pl
 msgid "no arguments accepted"
@@ -269,6 +267,13 @@ msgstr "zwei Befehle angegeben: --%s und --%s"
 msgid "%s needs a parameter"
 msgstr "%s benötigt einen Parameter"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Aufruf: %s [<Option> …]"
+
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options:\n"
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 98f840c..7b03361 100644
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.22.4\n"
+"Project-Id-Version: dpkg 1.22.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgid ""
 "later for copying conditions. There is NO warranty.\n"
 msgstr ""
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr ""
@@ -143,20 +143,17 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr ""
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
+#: scripts/dpkg-buildapi.pl
+msgid ""
+"Commands:\n"
+"  -?, --help               show this help message.\n"
+"      --version            show the version."
 msgstr ""
 
 #: scripts/dpkg-buildapi.pl
 msgid ""
 "Options:\n"
 "  -c<control-file>         get control info from this file.\n"
-"  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
 msgstr ""
 
 #: scripts/dpkg-buildapi.pl
@@ -201,6 +198,13 @@ msgstr ""
 msgid "%s needs a parameter"
 msgstr ""
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options:\n"
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 6268b1b..1c92dd9 100644
--- a/scripts/po/es.po
+++ b/scripts/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2014-12-02 20:24+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -70,7 +70,7 @@ msgstr ""
 "Esto es software libre; vea la versión 2 o posterior de la Licencia Pública\n"
 "General GNU para condiciones de copia. NO hay ninguna garantía.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Uso: %s [<opción>...] [<orden>]"
@@ -233,14 +233,6 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "no se pudo ejecutar %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Uso: %s [<opción>...]"
-
 #: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid ""
@@ -251,10 +243,9 @@ msgstr "Uso: %s [<opción>...]"
 #| "  -?, --help               show this help message.\n"
 #| "      --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Uso: %s [<opción>...] <nombre-fichero> <sección> <prioridad>\n"
 "\n"
@@ -265,6 +256,12 @@ msgstr ""
 "      --version             Muestra la versión.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid "one to three arguments expected"
 msgid "no arguments accepted"
@@ -353,6 +350,13 @@ msgstr "se han definido dos órdenes: «--%s» y «--%s»"
 msgid "%s needs a parameter"
 msgstr "%s requiere un parámetro"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Uso: %s [<opción>...]"
+
 #: scripts/dpkg-buildpackage.pl
 #, fuzzy
 #| msgid ""
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index d0bd724..a690156 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.21.20\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2023-02-10 02:16+0100\n"
 "Last-Translator: Sébastien Poher <sebastien@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 "dans la version 2 ou une version supérieure pour les conditions de copie. Il "
 "n'y a PAS de garantie.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Usage: %s [<option>...] [<commande>]"
@@ -199,14 +199,6 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "impossible d'exécuter %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Utilisation : %s [<option>...]"
-
 #: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid ""
@@ -217,10 +209,9 @@ msgstr "Utilisation : %s [<option>...]"
 #| "  -?, --help               show this help message.\n"
 #| "      --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Syntaxe : %s [<option>...] <fichier> <section> <priorité>\n"
 "\n"
@@ -231,6 +222,12 @@ msgstr ""
 "      --version                afficher la version.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid "one to three arguments expected"
 msgid "no arguments accepted"
@@ -319,6 +316,13 @@ msgstr "deux commandes indiquées : --%s et --%s"
 msgid "%s needs a parameter"
 msgstr "paramètre nécessaire pour %s"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Utilisation : %s [<option>...]"
+
 #: scripts/dpkg-buildpackage.pl
 #, fuzzy
 #| msgid ""
diff --git a/scripts/po/nl.po b/scripts/po/nl.po
index e3cc4f4..3d16f22 100644
--- a/scripts/po/nl.po
+++ b/scripts/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.21.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2023-02-02 17:51+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: \n"
@@ -47,7 +47,7 @@ msgstr ""
 "Dit is vrije software; zie de GNU General Public-licentie versie 2 of\n"
 "later voor kopieervoorwaarden. Er is GEEN garantie.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Gebruik: %s [<optie>...] [<commando>]"
@@ -186,14 +186,6 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "kan %s niet uitvoeren"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Gebruik: %s [<optie>...]"
-
 #: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid ""
@@ -204,10 +196,9 @@ msgstr "Gebruik: %s [<optie>...]"
 #| "  -?, --help               show this help message.\n"
 #| "      --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Gebruik: %s [<optie>...] <bestandsnaam> <sectie> <prioriteit>\n"
 "\n"
@@ -218,6 +209,12 @@ msgstr ""
 "      --version            de versie tonen.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid "one to three arguments expected"
 msgid "no arguments accepted"
@@ -304,6 +301,13 @@ msgstr "twee commando's opgegeven: --%s en --%s"
 msgid "%s needs a parameter"
 msgstr "%s heeft een parameter nodig"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Gebruik: %s [<optie>...]"
+
 #: scripts/dpkg-buildpackage.pl
 #, fuzzy
 #| msgid ""
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 948277f..3b04a9e 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2015-04-07 07:05+0200\n"
 "Last-Translator: Łukasz Dulny <BartekChom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr ""
 "licencji GNU w wersji drugiej lub późniejszej. Brak JAKIEJKOLWIEK "
 "gwarancji.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Użycie: %s [<opcja>...] [<polecenie>]"
@@ -205,14 +205,6 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "nie można wykonać %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Użycie: %s [<opcja>...]"
-
 #: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid ""
@@ -223,10 +215,9 @@ msgstr "Użycie: %s [<opcja>...]"
 #| "  -?, --help               show this help message.\n"
 #| "      --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Użycie: %s [<opcja> ...] <nazwa-pliku> <sekcja> <priorytet>\n"
 "\n"
@@ -237,6 +228,12 @@ msgstr ""
 "      --version            wyświetla wersję.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid "one to three arguments expected"
 msgid "no arguments accepted"
@@ -321,6 +318,13 @@ msgstr "podano dwa polecenia: --%s i --%s"
 msgid "%s needs a parameter"
 msgstr "%s wymaga podania parametru"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Użycie: %s [<opcja>...]"
+
 #: scripts/dpkg-buildpackage.pl
 #, fuzzy
 #| msgid ""
diff --git a/scripts/po/pt.po b/scripts/po/pt.po
index 027cd3f..9d63df4 100644
--- a/scripts/po/pt.po
+++ b/scripts/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.22.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2023-03-08 22:31+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -46,7 +46,7 @@ msgstr ""
 "Isto é software livre; veja a GNU General Public License versão 2 ou\n"
 "posterior para condições de cópia. NÃO há garantia.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Utilização: %s [<opção>...] [<comando>]"
@@ -190,14 +190,6 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "incapaz de executar %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Utilização: %s [<opção>...]"
-
 #: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid ""
@@ -208,10 +200,9 @@ msgstr "Utilização: %s [<opção>...]"
 #| "  -?, --help               show this help message.\n"
 #| "      --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Utilização: %s [<opção>...] <nome-ficheiro> <secção> <prioridade>\n"
 "\n"
@@ -222,6 +213,12 @@ msgstr ""
 "      --version           mostra a versão.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid "one to three arguments expected"
 msgid "no arguments accepted"
@@ -307,6 +304,13 @@ msgstr "dois comandos especificados: --%s e --%s"
 msgid "%s needs a parameter"
 msgstr "%s precisa dum parâmetro"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Utilização: %s [<opção>...]"
+
 #: scripts/dpkg-buildpackage.pl
 #, fuzzy
 #| msgid ""
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 8b79b16..c4350d9 100644
--- a/scripts/po/ru.po
+++ b/scripts/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2015-04-07 07:02+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 "Универсальной общественной лицензии GNU версии 2 или более поздней.\n"
 "НИКАКИЕ гарантии не предоставляются.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Использование: %s [<параметр>...] <команда>"
@@ -208,14 +208,6 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "невозможно выполнить %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Использование: %s [<параметр>...]"
-
 #: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid ""
@@ -226,10 +218,9 @@ msgstr "Использование: %s [<параметр>...]"
 #| "  -?, --help               show this help message.\n"
 #| "      --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Использование: %s [<параметр>...] <имя_файла> <секция> <приоритет>\n"
 "\n"
@@ -239,6 +230,12 @@ msgstr ""
 "      --version            показать версию\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 #, fuzzy
 #| msgid "one to three arguments expected"
 msgid "no arguments accepted"
@@ -321,6 +318,13 @@ msgstr "указаны две команды: --%s и --%s"
 msgid "%s needs a parameter"
 msgstr "для %s требуется параметр"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Использование: %s [<параметр>...]"
+
 #: scripts/dpkg-buildpackage.pl
 #, fuzzy
 #| msgid ""
diff --git a/scripts/po/sv.gmo b/scripts/po/sv.gmo
index d835fe8..d92acdc 100644
--- a/scripts/po/sv.gmo
+++ b/scripts/po/sv.gmo
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index eacf9db..166b1e8 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.22.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2024-01-24 13:12+0100\n"
+"POT-Creation-Date: 2024-02-27 04:27+0100\n"
 "PO-Revision-Date: 2023-12-27 14:43+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
@@ -47,7 +47,7 @@ msgstr ""
 "Detta program är fri programvara. Se GNU General Public License version 2\n"
 "eller senare för kopieringsvillkor. Det finns INGEN garanti.\n"
 
-#: scripts/dpkg-architecture.pl scripts/dpkg-vendor.pl
+#: scripts/dpkg-architecture.pl scripts/dpkg-buildapi.pl scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<command>]"
 msgstr "Användning: %s [<flagga>...] [<åtgärd>]"
@@ -180,20 +180,17 @@ msgstr ""
 msgid "unable to execute %s"
 msgstr "kan inte exekvera %s"
 
-#: scripts/dpkg-buildapi.pl scripts/dpkg-buildpackage.pl
-#: scripts/dpkg-genbuildinfo.pl scripts/dpkg-genchanges.pl
-#: scripts/dpkg-gencontrol.pl scripts/dpkg-gensymbols.pl
-#: scripts/dpkg-parsechangelog.pl
-#, perl-format
-msgid "Usage: %s [<option>...]"
-msgstr "Användning: %s [<flagga>...]"
-
 #: scripts/dpkg-buildapi.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -?, --help               show this help message.\n"
+#| "  -v, --version            show the version.\n"
 msgid ""
-"Options:\n"
-"  -c<control-file>         get control info from this file.\n"
+"Commands:\n"
 "  -?, --help               show this help message.\n"
-"  -v, --version            show the version.\n"
+"      --version            show the version."
 msgstr ""
 "Flaggor:\n"
 "  -c<control-fil>          hämta styrinfo från denna fil.\n"
@@ -201,6 +198,12 @@ msgstr ""
 "      --version            visa versionsnummer.\n"
 
 #: scripts/dpkg-buildapi.pl
+msgid ""
+"Options:\n"
+"  -c<control-file>         get control info from this file.\n"
+msgstr ""
+
+#: scripts/dpkg-buildapi.pl
 msgid "no arguments accepted"
 msgstr "inga argument godtas"
 
@@ -262,6 +265,13 @@ msgstr "två kommandon angavs: --%s och --%s"
 msgid "%s needs a parameter"
 msgstr "%s behöver en parameter"
 
+#: scripts/dpkg-buildpackage.pl scripts/dpkg-genbuildinfo.pl
+#: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
+#: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
+#, perl-format
+msgid "Usage: %s [<option>...]"
+msgstr "Användning: %s [<flagga>...]"
+
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options:\n"
diff --git a/scripts/t/Dpkg_BuildFlags.t b/scripts/t/Dpkg_BuildFlags.t
index 530871c..515ed15 100644
--- a/scripts/t/Dpkg_BuildFlags.t
+++ b/scripts/t/Dpkg_BuildFlags.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 40;
+use Test::More tests => 100;
 
 BEGIN {
     $ENV{DEB_BUILD_ARCH} = 'amd64';
@@ -171,4 +171,119 @@ $ENV{DEB_BUILD_MAINT_OPTIONS} = 'future=+lfs abi=-lfs';
 $bf = Dpkg::BuildFlags->new();
 test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
 
+# Test time64 abi features, for a 64-bit system, a 32-bit system with time64
+# and a 32-bit system with time32.
+
+# 32-bit system with time32, time64 not enabled by default.
+$ENV{DEB_BUILD_ARCH} = 'i386';
+$ENV{DEB_HOST_ARCH} = 'i386';
+
+undef $ENV{DEB_BUILD_MAINT_OPTIONS};
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_flag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_flag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_flag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+# 32-bit system with time32 and no time64.
+$ENV{DEB_BUILD_ARCH} = 'hurd-i386';
+$ENV{DEB_HOST_ARCH} = 'hurd-i386';
+
+undef $ENV{DEB_BUILD_MAINT_OPTIONS};
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+# 32-bit system with time32, time64 enabled by default.
+$ENV{DEB_BUILD_ARCH} = 'armhf';
+$ENV{DEB_HOST_ARCH} = 'armhf';
+
+undef $ENV{DEB_BUILD_MAINT_OPTIONS};
+$bf = Dpkg::BuildFlags->new();
+test_has_flag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_flag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_flag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_flag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_flag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_flag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_flag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_flag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+# 64-bit system with built-in time64.
+$ENV{DEB_BUILD_ARCH} = 'amd64';
+$ENV{DEB_HOST_ARCH} = 'amd64';
+
+undef $ENV{DEB_BUILD_MAINT_OPTIONS};
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=+time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
+$ENV{DEB_BUILD_MAINT_OPTIONS} = 'abi=-time64';
+$bf = Dpkg::BuildFlags->new();
+test_has_noflag($bf, 'CPPFLAGS', '-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_LARGEFILE_SOURCE -U_FILE_OFFSET_BITS');
+test_has_noflag($bf, 'CPPFLAGS', '-D_TIME_BITS=64');
+test_has_noflag($bf, 'CPPFLAGS', '-U_TIME_BITS');
+test_has_noflag($bf, 'CFLAGS', '-Werror=implicit-function-declaration');
+
 # TODO: Add more test cases.
diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t
index c3cd724..d409082 100644
--- a/scripts/t/Dpkg_OpenPGP.t
+++ b/scripts/t/Dpkg_OpenPGP.t
@@ -27,6 +27,7 @@ use Dpkg::OpenPGP::KeyHandle;
 
 my %backend_cmd = (
     auto => 'auto',
+    'gpg-sq' => 'gpg',
     gpg => 'gpg',
     sq => 'sq',
     sqop => 'sop',