Merging upstream version 1.22.8.

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

1 files changed, 226 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b3f973..9da5278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,229 @@
+commit e9a8f699fa73f896d179ff60d9cdf9ec0340efa6
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 21 20:18:44 2024 +0200
+
+    Release 1.22.8
+
+ debian/changelog | 25 ++++++++++++++++++++++---
+ 1 file changed, 22 insertions(+), 3 deletions(-)
+
+commit ccaea43c6d44182b11f5b7be2a73a44033bcb307
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 21 20:18:23 2024 +0200
+
+    po: Regenerate .pot files and merge .po files with them
+
+ dselect/po/bs.po        |  2 +-
+ dselect/po/ca.po        |  2 +-
+ dselect/po/cs.po        |  2 +-
+ dselect/po/da.po        |  2 +-
+ dselect/po/de.po        |  2 +-
+ dselect/po/dselect.pot  |  4 ++--
+ dselect/po/el.po        |  2 +-
+ dselect/po/es.po        |  2 +-
+ dselect/po/et.po        |  2 +-
+ dselect/po/eu.po        |  2 +-
+ dselect/po/fr.po        |  2 +-
+ dselect/po/gl.po        |  2 +-
+ dselect/po/hu.po        |  2 +-
+ dselect/po/id.po        |  2 +-
+ dselect/po/it.po        |  2 +-
+ dselect/po/ja.po        |  2 +-
+ dselect/po/ko.po        |  2 +-
+ dselect/po/nb.po        |  2 +-
+ dselect/po/nl.po        |  2 +-
+ dselect/po/nn.po        |  2 +-
+ dselect/po/pl.po        |  2 +-
+ dselect/po/pt.po        |  2 +-
+ dselect/po/pt_BR.po     |  2 +-
+ dselect/po/ro.po        |  2 +-
+ dselect/po/ru.po        |  2 +-
+ dselect/po/sk.po        |  2 +-
+ dselect/po/sv.po        |  2 +-
+ dselect/po/tl.po        |  2 +-
+ dselect/po/vi.po        |  2 +-
+ dselect/po/zh_CN.po     |  2 +-
+ dselect/po/zh_TW.po     |  2 +-
+ man/po/dpkg-man.pot     |  4 ++--
+ po/ast.po               |  2 +-
+ po/bs.po                |  2 +-
+ po/ca.po                |  2 +-
+ po/cs.po                |  2 +-
+ po/da.po                |  2 +-
+ po/de.po                |  2 +-
+ po/dpkg.pot             |  4 ++--
+ po/dz.po                |  2 +-
+ po/el.po                |  2 +-
+ po/eo.po                |  2 +-
+ po/es.po                |  2 +-
+ po/et.po                |  2 +-
+ po/eu.po                |  2 +-
+ po/fr.po                |  2 +-
+ po/gl.po                |  2 +-
+ po/hu.po                |  2 +-
+ po/id.po                |  2 +-
+ po/it.po                |  2 +-
+ po/ja.po                |  2 +-
+ po/km.po                |  2 +-
+ po/ko.po                |  2 +-
+ po/ku.po                |  2 +-
+ po/lt.po                |  2 +-
+ po/mr.po                |  2 +-
+ po/nb.po                |  2 +-
+ po/ne.po                |  2 +-
+ po/nl.po                |  2 +-
+ po/nn.po                |  2 +-
+ po/oc.po                |  2 +-
+ po/pa.po                |  2 +-
+ po/pl.po                |  2 +-
+ po/pt.po                |  2 +-
+ po/pt_BR.po             |  2 +-
+ po/ro.po                |  2 +-
+ po/ru.po                |  2 +-
+ po/sk.po                |  2 +-
+ po/sv.po                |  2 +-
+ po/th.po                |  2 +-
+ po/tl.po                |  2 +-
+ po/tr.po                |  2 +-
+ po/vi.po                |  2 +-
+ po/zh_CN.po             |  2 +-
+ po/zh_TW.po             |  2 +-
+ scripts/po/ca.po        |  2 +-
+ scripts/po/de.po        | 27 ++++++++++++++++-----------
+ scripts/po/dpkg-dev.pot | 20 ++++++++++----------
+ scripts/po/es.po        | 27 ++++++++++++++++-----------
+ scripts/po/fr.po        | 27 ++++++++++++++++-----------
+ scripts/po/nl.po        | 27 ++++++++++++++++-----------
+ scripts/po/pl.po        | 27 ++++++++++++++++-----------
+ scripts/po/pt.po        | 27 ++++++++++++++++-----------
+ scripts/po/ru.po        | 27 ++++++++++++++++-----------
+ scripts/po/sv.po        | 27 ++++++++++++++++-----------
+ 85 files changed, 217 insertions(+), 177 deletions(-)
+
+commit 017079b0c97f64d5b1647ea2d1fed5dcf4902c5b
+Author: Nicolas Boulenguez <nicolas@debian.org>
+Date:   Fri Jul 19 14:24:22 2024 +0200
+
+    scripts/mk: Fix make variable expansions passed to dpkg-buildflags
+    
+    Add a regression test.
+    
+    Closes: #1076568
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ scripts/mk/buildflags.mk   | 2 +-
+ scripts/t/mk/buildflags.mk | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+commit 574081691a80a4d3d6e28caf249397fcb6ae37e1
+Author: Nicolas Boulenguez <nicolas@debian.org>
+Date:   Fri Jul 19 13:20:06 2024 +0200
+
+    scripts/mk: Ensure dpkg_datadir is computed once
+    
+    dpkg_datadir ?= $(dir $(lastword $(MAKEFILE_LIST)))
+    is equivalent to
+    ifndef dpkg_datadir
+      dpkg_datadir = $(..)
+    endif
+    $(..) is computed each time dpkg_datadir is expanded, so the result
+    will be wrong if MAKEFILE_LIST has grown meanwhile.
+    
+    Assign with := so that the value is computed and never expanded again.
+    
+    Signed-off-by: Guillem Jover <guillem@debian.org>
+
+ scripts/mk/buildtools.mk | 4 +++-
+ scripts/mk/vendor.mk     | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+commit f2f447be4a5dfa492d8505208aa8720b90440123
+Author: Guillem Jover <guillem@debian.org>
+Date:   Thu Jul 18 01:56:39 2024 +0200
+
+    po: Update Catalan translations
+
+ po/ca.po         |  63 +++++++--------
+ scripts/po/ca.po | 230 +++++++++++++++++++++----------------------------------
+ 2 files changed, 115 insertions(+), 178 deletions(-)
+
+commit 286fc746725d094d0933d22a802cba224f2def15
+Author: Guillem Jover <guillem@debian.org>
+Date:   Sun Jul 21 04:37:48 2024 +0200
+
+    Dpkg::Archive::Ar: Rework _read_buf() error messages to make l10n easier
+    
+    Try to word the error messages so that they can be easily translated,
+    even when they need to match gender and number.
+
+ scripts/Dpkg/Archive/Ar.pm | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit ad717618ed21fba80e16cdc3bc50c35d0920ce8a
+Author: Sven Joachim <svenjoac@gmx.de>
+Date:   Wed Jul 17 17:11:42 2024 +0200
+
+    po: Update German programs translation
+    
+    Update to 1196t.
+
+ po/de.po | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+commit 127d25ed1220221f03d9bf11b906f89a065fcfad
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 17 11:40:49 2024 +0200
+
+    libdpkg: Fix execname support on GNU/Hurd
+    
+    Implement the missing code, and handle fcntl() returning -1 for the
+    locked pid.
+    
+    We need to link against Hurd's libps and add it to libdpkg.pc, for the
+    process functions.
+    
+    We need to protect the <dpkg/file.h> inclusion when including <hurd.h>
+    as they have conflicting symbols for file_lock(), where the dpkg header
+    is only needed on Solaris-based systems.
+    
+    Fixes: commit d6a9bb6951166a7254ab2b4f887c69c4bd4fb1a7
+
+ lib/dpkg/Makefile.am   |  1 +
+ lib/dpkg/execname.c    | 26 +++++++++++++++++++++++---
+ lib/dpkg/libdpkg.pc.in |  2 +-
+ 3 files changed, 25 insertions(+), 4 deletions(-)
+
+commit 94e57741131f0f7bb30df5e93cfb19cb5f4e1024
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 17 02:16:07 2024 +0200
+
+    build: Update lcov usage for version 2.0
+    
+    Update configuration options. Adapt lcov-inject for new HTML output.
+    Remove system header removal, no longer needed.
+
+ Makefile.am           |  4 +---
+ build-aux/lcov-inject | 13 +++++++------
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+commit 1aba90294630ee581799bd4dcdc2c09d104a56d8
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 17 02:12:54 2024 +0200
+
+    doc: Update Doxygen configuration from version 1.9.8
+
+ doc/Doxyfile.in | 342 ++++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 234 insertions(+), 108 deletions(-)
+
+commit 7c1ab6e311fc44f8c856e973944580f2c10af51d
+Author: Guillem Jover <guillem@debian.org>
+Date:   Wed Jul 17 01:46:15 2024 +0200
+
+    Bump version to 1.22.8
+
+ debian/changelog | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
 commit 7603b54e29911e4ff534c73f0c37d25a0a35c578
 Author: Guillem Jover <guillem@debian.org>
 Date:   Wed Jul 17 01:14:41 2024 +0200