From 0d707535134d076e4074fc42997746f6bded1660 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 7 Aug 2024 15:31:23 +0200 Subject: Merging upstream version 1.22.8. Signed-off-by: Daniel Baumann --- .dist-vcs-id | 2 +- .dist-version | 2 +- ChangeLog | 226 ++++++++++++++++++++++++++++++ Makefile.am | 4 +- Makefile.in | 4 +- build-aux/lcov-inject | 13 +- configure | 22 +-- doc/Doxyfile.in | 342 +++++++++++++++++++++++++++++++-------------- 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 +- lib/dpkg/Makefile.am | 1 + lib/dpkg/Makefile.in | 3 +- lib/dpkg/execname.c | 26 +++- lib/dpkg/libdpkg.pc.in | 2 +- man/po/dpkg-man.pot | 4 +- po/ast.po | 2 +- po/bs.po | 2 +- po/ca.gmo | Bin 178913 -> 180605 bytes po/ca.po | 65 ++++----- po/cs.po | 2 +- po/da.po | 2 +- po/de.gmo | Bin 176531 -> 176680 bytes po/de.po | 16 +-- 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/Dpkg/Archive/Ar.pm | 16 +-- scripts/mk/buildflags.mk | 2 +- scripts/mk/buildtools.mk | 4 +- scripts/mk/vendor.mk | 4 +- scripts/po/ca.gmo | Bin 118502 -> 126665 bytes scripts/po/ca.po | 230 ++++++++++++------------------ 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 ++-- scripts/t/mk/buildflags.mk | 4 + src/at/package.m4 | 4 +- src/at/testsuite | 10 +- 107 files changed, 870 insertions(+), 520 deletions(-) diff --git a/.dist-vcs-id b/.dist-vcs-id index 66148ba..e3e3021 100644 --- a/.dist-vcs-id +++ b/.dist-vcs-id @@ -1 +1 @@ -7603b54e29911e4ff534c73f0c37d25a0a35c578 +e9a8f699fa73f896d179ff60d9cdf9ec0340efa6 diff --git a/.dist-version b/.dist-version index 87b26e8..229a27c 100644 --- a/.dist-version +++ b/.dist-version @@ -1 +1 @@ -1.22.7 +1.22.8 diff --git a/ChangeLog b/ChangeLog index 5b3f973..9da5278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,229 @@ +commit e9a8f699fa73f896d179ff60d9cdf9ec0340efa6 +Author: Guillem Jover +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 +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 +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 + + scripts/mk/buildflags.mk | 2 +- + scripts/t/mk/buildflags.mk | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 574081691a80a4d3d6e28caf249397fcb6ae37e1 +Author: Nicolas Boulenguez +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 + + scripts/mk/buildtools.mk | 4 +++- + scripts/mk/vendor.mk | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit f2f447be4a5dfa492d8505208aa8720b90440123 +Author: Guillem Jover +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 +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 +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 +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 inclusion when including + 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 +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 +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 +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 Date: Wed Jul 17 01:14:41 2024 +0200 diff --git a/Makefile.am b/Makefile.am index 97f4c2b..74f8df1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,7 +124,7 @@ doc-clean: .PHONY: coverage coverage-clean if COVERAGE_ENABLED -LCOV_OPTS = --quiet --rc geninfo_checksum=1 --rc lcov_branch_coverage=1 +LCOV_OPTS = --quiet --rc checksum=1 --rc branch_coverage=1 LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \ --directory $(top_builddir)/lib/dpkg \ --directory $(top_builddir)/src/common \ @@ -157,8 +157,6 @@ coverage: all $(LCOV) $(LCOV_OPTS) \ --add-tracefile dpkg_base.lcov \ --add-tracefile dpkg_test.lcov \ - --output-file dpkg_merge.lcov - $(LCOV) $(LCOV_OPTS) --remove dpkg_merge.lcov '/usr/include/*' \ --output-file dpkg.lcov : # Generate reports $(LCOV) $(LCOV_OPTS) --list dpkg.lcov diff --git a/Makefile.in b/Makefile.in index 8e4cdb1..2f2ad41 100644 --- a/Makefile.in +++ b/Makefile.in @@ -552,7 +552,7 @@ EXTRA_DIST = ChangeLog.old README.l10n autogen build-aux/gen-changelog \ debian/tests/test-not-root debian/tests/test-root \ po/its/polkit.its po/its/polkit.loc tests $(test_scripts) \ $(test_data) # EOL -@COVERAGE_ENABLED_TRUE@LCOV_OPTS = --quiet --rc geninfo_checksum=1 --rc lcov_branch_coverage=1 +@COVERAGE_ENABLED_TRUE@LCOV_OPTS = --quiet --rc checksum=1 --rc branch_coverage=1 @COVERAGE_ENABLED_TRUE@LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \ @COVERAGE_ENABLED_TRUE@ --directory $(top_builddir)/lib/dpkg \ @COVERAGE_ENABLED_TRUE@ --directory $(top_builddir)/src/common \ @@ -1223,8 +1223,6 @@ doc-clean: @COVERAGE_ENABLED_TRUE@ $(LCOV) $(LCOV_OPTS) \ @COVERAGE_ENABLED_TRUE@ --add-tracefile dpkg_base.lcov \ @COVERAGE_ENABLED_TRUE@ --add-tracefile dpkg_test.lcov \ -@COVERAGE_ENABLED_TRUE@ --output-file dpkg_merge.lcov -@COVERAGE_ENABLED_TRUE@ $(LCOV) $(LCOV_OPTS) --remove dpkg_merge.lcov '/usr/include/*' \ @COVERAGE_ENABLED_TRUE@ --output-file dpkg.lcov @COVERAGE_ENABLED_TRUE@ : # Generate reports @COVERAGE_ENABLED_TRUE@ $(LCOV) $(LCOV_OPTS) --list dpkg.lcov diff --git a/build-aux/lcov-inject b/build-aux/lcov-inject index 9dd5896..98e9532 100755 --- a/build-aux/lcov-inject +++ b/build-aux/lcov-inject @@ -2,7 +2,7 @@ # # lcov-inject # -# Copyright © 2014 Guillem Jover +# Copyright © 2014-2024 Guillem Jover # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ chdir $cwd or die "cannot switch to $cwd\n"; my $s = $db->{summary}{Total}; my $tmpl = sprintf ' - %s + %s @@ -50,10 +50,10 @@ my $tmpl = sprintf ' ', "$dir/coverage.html", $dir, bar_html($s->{total}{percentage}), - box_html($s->{total}), box_html($s->{subroutine}), box_html($s->{branch}); + box_html($s->{total}), box_html($s->{branch}), box_html($s->{subroutine}); while (<>) { - s/^(.*' . "\n" . - '', + '' . "\n" . + '', box_rating($stats->{percentage}), $stats->{percentage}, - box_rating($stats->{percentage}), $stats->{covered}, $stats->{total}; + 'Dflt', $stats->{total}, 'Dflt', $stats->{covered}; } diff --git a/configure b/configure index 7c7e9ff..9453369 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for dpkg 1.22.7. +# Generated by GNU Autoconf 2.71 for dpkg 1.22.8. # # Report bugs to . # @@ -681,8 +681,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dpkg' PACKAGE_TARNAME='dpkg' -PACKAGE_VERSION='1.22.7' -PACKAGE_STRING='dpkg 1.22.7' +PACKAGE_VERSION='1.22.8' +PACKAGE_STRING='dpkg 1.22.8' PACKAGE_BUGREPORT='debian-dpkg@lists.debian.org' PACKAGE_URL='https://wiki.debian.org/Teams/Dpkg' @@ -1613,7 +1613,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dpkg 1.22.7 to adapt to many kinds of systems. +\`configure' configures dpkg 1.22.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1684,7 +1684,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dpkg 1.22.7:";; + short | recursive ) echo "Configuration of dpkg 1.22.8:";; esac cat <<\_ACEOF @@ -1887,7 +1887,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dpkg configure 1.22.7 +dpkg configure 1.22.8 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2703,7 +2703,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dpkg $as_me 1.22.7, which was +It was created by dpkg $as_me 1.22.8, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3701,7 +3701,7 @@ fi PACKAGE_COPYRIGHT_HOLDER='Dpkg Developers' -PACKAGE_VCS_ID=7603b54e29911e4ff534c73f0c37d25a0a35c578 +PACKAGE_VCS_ID=e9a8f699fa73f896d179ff60d9cdf9ec0340efa6 PACKAGE_VCS_TYPE=git @@ -5523,7 +5523,7 @@ fi # Define the identity of the package. PACKAGE='dpkg' - VERSION='1.22.7' + VERSION='1.22.8' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -34314,7 +34314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dpkg $as_me 1.22.7, which was +This file was extended by dpkg $as_me 1.22.8, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34383,7 +34383,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -dpkg config.status 1.22.7 +dpkg config.status 1.22.8 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 3faf8a4..d15114f 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,4 +1,4 @@ -# Doxyfile 1.9.4 +# Doxyfile 1.9.8 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -19,7 +19,8 @@ # configuration file: # doxygen -x [configFile] # Use doxygen to compare the used configuration file with the template -# configuration file without replacing the environment variables: +# configuration file without replacing the environment variables or CMake type +# replacement variables: # doxygen -x_noenv [configFile] #--------------------------------------------------------------------------- @@ -352,6 +353,17 @@ MARKDOWN_SUPPORT = YES TOC_INCLUDE_HEADINGS = 0 +# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to +# generate identifiers for the Markdown headings. Note: Every identifier is +# unique. +# Possible values are: DOXYGEN use a fixed 'autotoc_md' string followed by a +# sequence number starting at 0 and GITHUB use the lower case version of title +# with any whitespace replaced by '-' and punctuation characters removed. +# The default value is: DOXYGEN. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +MARKDOWN_ID_STYLE = DOXYGEN + # When enabled doxygen tries to link words that correspond to documented # classes, or namespaces to their corresponding documentation. Such a link can # be prevented in individual cases by putting a % sign in front of the word or @@ -476,6 +488,14 @@ LOOKUP_CACHE_SIZE = 0 NUM_PROC_THREADS = 1 +# If the TIMESTAMP tag is set different from NO then each generated page will +# contain the date or date and time when the page was generated. Setting this to +# NO can help when comparing the output of multiple runs. +# Possible values are: YES, NO, DATETIME and DATE. +# The default value is: NO. + +TIMESTAMP = NO + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -557,7 +577,8 @@ HIDE_UNDOC_MEMBERS = NO # If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all # undocumented classes that are normally visible in the class hierarchy. If set # to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. +# will also hide undocumented C++ concepts if enabled. This option has no effect +# if EXTRACT_ALL is enabled. # The default value is: NO. HIDE_UNDOC_CLASSES = NO @@ -595,7 +616,8 @@ INTERNAL_DOCS = NO # Windows (including Cygwin) and MacOS, users should typically set this option # to NO, whereas on Linux or other Unix flavors it should typically be set to # YES. -# The default value is: system dependent. +# Possible values are: SYSTEM, NO and YES. +# The default value is: SYSTEM. CASE_SENSE_NAMES = YES @@ -847,11 +869,26 @@ WARN_IF_INCOMPLETE_DOC = YES WARN_NO_PARAMDOC = NO +# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about +# undocumented enumeration values. If set to NO, doxygen will accept +# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: NO. + +WARN_IF_UNDOC_ENUM_VAL = NO + # If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when # a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS # then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but # at the end of the doxygen process doxygen will return with a non-zero status. -# Possible values are: NO, YES and FAIL_ON_WARNINGS. +# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves +# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not +# write the warning messages in between other messages but write them at the end +# of a run, in case a WARN_LOGFILE is defined the warning messages will be +# besides being in the defined file also be shown at the end of a run, unless +# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case +# the behavior will remain as with the setting FAIL_ON_WARNINGS. +# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT. # The default value is: NO. WARN_AS_ERROR = NO @@ -905,10 +942,21 @@ INPUT = lib/dpkg \ # libiconv (or the iconv built into libc) for the transcoding. See the libiconv # documentation (see: # https://www.gnu.org/software/libiconv/) for the list of possible encodings. +# See also: INPUT_FILE_ENCODING # The default value is: UTF-8. INPUT_ENCODING = UTF-8 +# This tag can be used to specify the character encoding of the source files +# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify +# character encoding on a per file pattern basis. Doxygen will compare the file +# name with each pattern and apply the encoding instead of the default +# INPUT_ENCODING) if there is a match. The character encodings are a list of the +# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding +# "INPUT_ENCODING" for further information on supported encodings. + +INPUT_FILE_ENCODING = + # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and # *.h) to filter out the source-files in the directories. @@ -920,12 +968,12 @@ INPUT_ENCODING = UTF-8 # Note the list of default checked file patterns might differ from the list of # default file extension mappings. # -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, -# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C -# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, -# *.vhdl, *.ucf, *.qsf and *.ice. +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cxxm, +# *.cpp, *.cppm, *.c++, *.c++m, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, +# *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, *.h++, *.ixx, *.l, *.cs, *.d, *.php, +# *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be +# provided as doxygen C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f18, *.f, *.for, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice. FILE_PATTERNS = *.c \ *.h @@ -966,9 +1014,6 @@ EXCLUDE_PATTERNS = */t/* # output. The symbol name can be a fully qualified name, a word, or if the # wildcard * is used, a substring. Examples: ANamespace, AClass, # ANamespace::AClass, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* EXCLUDE_SYMBOLS = @@ -1013,6 +1058,11 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. # +# Note that doxygen will use the data processed and written to standard output +# for further processing, therefore nothing else, like debug statements or used +# commands (so in case of a Windows batch file always use @echo OFF), should be +# written to standard output. +# # Note that for custom extensions or not directly supported extensions you also # need to set EXTENSION_MAPPING for the extension otherwise the files are not # properly processed by doxygen. @@ -1054,6 +1104,15 @@ FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = +# The Fortran standard specifies that for fixed formatted Fortran code all +# characters from position 72 are to be considered as comment. A common +# extension is to allow longer lines before the automatic comment starts. The +# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can +# be processed before the automatic comment starts. +# Minimum value: 7, maximum value: 10000, default value: 72. + +FORTRAN_COMMENT_AFTER = 72 + #--------------------------------------------------------------------------- # Configuration options related to source browsing #--------------------------------------------------------------------------- @@ -1191,10 +1250,11 @@ CLANG_DATABASE_PATH = ALPHABETICAL_INDEX = NO -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. +# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes) +# that should be ignored while generating the index headers. The IGNORE_PREFIX +# tag works for classes, function and member names. The entity will be placed in +# the alphabetical list under the first letter of the entity name that remains +# after removing the prefix. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. IGNORE_PREFIX = @@ -1273,7 +1333,12 @@ HTML_STYLESHEET = # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra style sheet files is of importance (e.g. the last # style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. +# list). +# Note: Since the styling of scrollbars can currently not be overruled in +# Webkit/Chromium, the styling will be left out of the default doxygen.css if +# one or more extra stylesheets have been specified. So if scrollbar +# customization is desired it has to be added explicitly. For an example see the +# documentation. # This tag requires that the tag GENERATE_HTML is set to YES. HTML_EXTRA_STYLESHEET = @@ -1288,6 +1353,19 @@ HTML_EXTRA_STYLESHEET = HTML_EXTRA_FILES = +# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output +# should be rendered with a dark or light theme. +# Possible values are: LIGHT always generate light mode output, DARK always +# generate dark mode output, AUTO_LIGHT automatically set the mode according to +# the user preference, use light mode if no preference is set (the default), +# AUTO_DARK automatically set the mode according to the user preference, use +# dark mode if no preference is set and TOGGLE allow to user to switch between +# light and dark mode via a button. +# The default value is: AUTO_LIGHT. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE = AUTO_LIGHT + # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen # will adjust the colors in the style sheet and background images according to # this color. Hue is specified as an angle on a color-wheel, see @@ -1318,15 +1396,6 @@ HTML_COLORSTYLE_SAT = 100 HTML_COLORSTYLE_GAMMA = 80 -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML # documentation will contain a main index with vertical navigation menus that # are dynamically created via JavaScript. If disabled, the navigation index will @@ -1346,6 +1415,13 @@ HTML_DYNAMIC_MENUS = YES HTML_DYNAMIC_SECTIONS = NO +# If the HTML_CODE_FOLDING tag is set to YES then classes and functions can be +# dynamically folded and expanded in the generated HTML source code. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_CODE_FOLDING = YES + # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries # shown in the various tree structured indices initially; the user can expand # and collapse entries dynamically later on. Doxygen will expand the tree to @@ -1476,6 +1552,16 @@ BINARY_TOC = NO TOC_EXPAND = NO +# The SITEMAP_URL tag is used to specify the full URL of the place where the +# generated documentation will be placed on the server by the user during the +# deployment of the documentation. The generated sitemap is called sitemap.xml +# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL +# is specified no sitemap is generated. For information about the sitemap +# protocol see https://www.sitemaps.org +# This tag requires that the tag GENERATE_HTML is set to YES. + +SITEMAP_URL = + # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and # QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that # can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help @@ -1651,17 +1737,6 @@ HTML_FORMULA_FORMAT = png FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANSPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - # The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands # to create new LaTeX commands to be used in formulas as building blocks. See # the section "Including formulas" for details. @@ -1975,9 +2050,16 @@ PDF_HYPERLINKS = YES USE_PDFLATEX = YES -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode -# command to the generated LaTeX files. This will instruct LaTeX to keep running -# if errors occur, instead of asking the user for help. +# The LATEX_BATCHMODE tag signals the behavior of LaTeX in case of an error. +# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch +# mode nothing is printed on the terminal, errors are scrolled as if is +# hit at every error; missing files that TeX tries to input or request from +# keyboard input (\read on a not open input stream) cause the job to abort, +# NON_STOP In nonstop mode the diagnostic message will appear on the terminal, +# but there is no possibility of user interaction just like in batch mode, +# SCROLL In scroll mode, TeX will stop only for missing files to input or if +# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at +# each error, asking for user intervention. # The default value is: NO. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -1998,14 +2080,6 @@ LATEX_HIDE_INDICES = NO LATEX_BIB_STYLE = plain -# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated -# page will contain the date and time when the page was generated. Setting this -# to NO can help when comparing the output of multiple runs. -# The default value is: NO. -# This tag requires that the tag GENERATE_LATEX is set to YES. - -LATEX_TIMESTAMP = NO - # The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute) # path from which the emoji images will be read. If a relative path is entered, # it will be relative to the LATEX_OUTPUT directory. If left blank the @@ -2171,13 +2245,39 @@ DOCBOOK_OUTPUT = docbook #--------------------------------------------------------------------------- # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an -# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures # the structure of the code including all documentation. Note that this feature # is still experimental and incomplete at the moment. # The default value is: NO. GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# Configuration options related to Sqlite3 output +#--------------------------------------------------------------------------- + +# If the GENERATE_SQLITE3 tag is set to YES doxygen will generate a Sqlite3 +# database with symbols found by doxygen stored in tables. +# The default value is: NO. + +GENERATE_SQLITE3 = NO + +# The SQLITE3_OUTPUT tag is used to specify where the Sqlite3 database will be +# put. If a relative path is entered the value of OUTPUT_DIRECTORY will be put +# in front of it. +# The default directory is: sqlite3. +# This tag requires that the tag GENERATE_SQLITE3 is set to YES. + +SQLITE3_OUTPUT = sqlite3 + +# The SQLITE3_OVERWRITE_DB tag is set to YES, the existing doxygen_sqlite3.db +# database file will be recreated with each doxygen run. If set to NO, doxygen +# will warn if an a database file is already found and not modify it. +# The default value is: YES. +# This tag requires that the tag GENERATE_SQLITE3 is set to YES. + +SQLITE3_RECREATE_DB = YES + #--------------------------------------------------------------------------- # Configuration options related to the Perl module output #--------------------------------------------------------------------------- @@ -2320,15 +2420,15 @@ TAGFILES = GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES, all external class will be listed in -# the class index. If set to NO, only the inherited external classes will be -# listed. +# If the ALLEXTERNALS tag is set to YES, all external classes and namespaces +# will be listed in the class and namespace index. If set to NO, only the +# inherited external classes will be listed. # The default value is: NO. ALLEXTERNALS = NO # If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will be +# in the topic index. If set to NO, only the current project's groups will be # listed. # The default value is: YES. @@ -2342,16 +2442,9 @@ EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to diagram generator tools #--------------------------------------------------------------------------- -# You can include diagrams made with dia in doxygen documentation. Doxygen will -# then run dia to produce the diagram and insert it in the documentation. The -# DIA_PATH tag allows you to specify the directory where the dia binary resides. -# If left empty dia is assumed to be found in the default search path. - -DIA_PATH = - # If set to YES the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. # The default value is: YES. @@ -2360,7 +2453,7 @@ HIDE_UNDOC_RELATIONS = YES # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is # available from the path. This tool is part of Graphviz (see: -# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent # Bell Labs. The other options in this section have no effect if this option is # set to NO # The default value is: YES. @@ -2377,37 +2470,51 @@ HAVE_DOT = @HAVE_DOT@ DOT_NUM_THREADS = 0 -# When you want a differently looking font in the dot files that doxygen -# generates you can specify the font name using DOT_FONTNAME. You need to make -# sure dot is able to find the font, which can be done by putting it in a -# standard location or by setting the DOTFONTPATH environment variable or by -# setting DOT_FONTPATH to the directory containing the font. -# The default value is: Helvetica. +# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of +# subgraphs. When you want a differently looking font in the dot files that +# doxygen generates you can specify fontname, fontcolor and fontsize attributes. +# For details please see Node, +# Edge and Graph Attributes specification You need to make sure dot is able +# to find the font, which can be done by putting it in a standard location or by +# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the +# directory containing the font. Default graphviz fontsize is 14. +# The default value is: fontname=Helvetica,fontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTNAME = +DOT_COMMON_ATTR = "fontname=Helvetica,fontsize=10" -# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of -# dot graphs. -# Minimum value: 4, maximum value: 24, default value: 10. +# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can +# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. Complete documentation about +# arrows shapes. +# The default value is: labelfontname=Helvetica,labelfontsize=10. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_FONTSIZE = 10 +DOT_EDGE_ATTR = "labelfontname=Helvetica,labelfontsize=10" -# By default doxygen will tell dot to use the default font as specified with -# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set -# the path where dot can find it using this tag. +# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes +# around nodes set 'shape=plain' or 'shape=plaintext' Shapes specification +# The default value is: shape=box,height=0.2,width=0.4. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4" + +# You can set the path where dot can find font specified with fontname in +# DOT_COMMON_ATTR and others dot attributes. # This tag requires that the tag HAVE_DOT is set to YES. DOT_FONTPATH = -# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a -# graph for each documented class showing the direct and indirect inheritance -# relations. In case HAVE_DOT is set as well dot will be used to draw the graph, -# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set -# to TEXT the direct and indirect inheritance relations will be shown as texts / -# links. -# Possible values are: NO, YES, TEXT and GRAPH. +# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will +# generate a graph for each documented class showing the direct and indirect +# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and +# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case +# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the +# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used. +# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance +# relations will be shown as texts / links. +# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN. # The default value is: YES. CLASS_GRAPH = YES @@ -2415,15 +2522,21 @@ CLASS_GRAPH = YES # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a # graph for each documented class showing the direct and indirect implementation # dependencies (inheritance, containment, and class references variables) of the -# class with other documented classes. +# class with other documented classes. Explicit enabling a collaboration graph, +# when COLLABORATION_GRAPH is set to NO, can be accomplished by means of the +# command \collaborationgraph. Disabling a collaboration graph can be +# accomplished by means of the command \hidecollaborationgraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. COLLABORATION_GRAPH = YES # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for -# groups, showing the direct groups dependencies. See also the chapter Grouping -# in the manual. +# groups, showing the direct groups dependencies. Explicit enabling a group +# dependency graph, when GROUP_GRAPHS is set to NO, can be accomplished by means +# of the command \groupgraph. Disabling a directory graph can be accomplished by +# means of the command \hidegroupgraph. See also the chapter Grouping in the +# manual. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2483,7 +2596,9 @@ TEMPLATE_RELATIONS = NO # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to # YES then doxygen will generate a graph for each documented file showing the # direct and indirect include dependencies of the file with other documented -# files. +# files. Explicit enabling an include graph, when INCLUDE_GRAPH is is set to NO, +# can be accomplished by means of the command \includegraph. Disabling an +# include graph can be accomplished by means of the command \hideincludegraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2492,7 +2607,10 @@ INCLUDE_GRAPH = YES # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are # set to YES then doxygen will generate a graph for each documented file showing # the direct and indirect include dependencies of the file with other documented -# files. +# files. Explicit enabling an included by graph, when INCLUDED_BY_GRAPH is set +# to NO, can be accomplished by means of the command \includedbygraph. Disabling +# an included by graph can be accomplished by means of the command +# \hideincludedbygraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2532,7 +2650,10 @@ GRAPHICAL_HIERARCHY = YES # If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the # dependencies a directory has on other directories in a graphical way. The # dependency relations are determined by the #include relations between the -# files in the directories. +# files in the directories. Explicit enabling a directory graph, when +# DIRECTORY_GRAPH is set to NO, can be accomplished by means of the command +# \directorygraph. Disabling a directory graph can be accomplished by means of +# the command \hidedirectorygraph. # The default value is: YES. # This tag requires that the tag HAVE_DOT is set to YES. @@ -2548,7 +2669,7 @@ DIR_GRAPH_MAX_DEPTH = 1 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. For an explanation of the image formats see the section # output formats in the documentation of the dot tool (Graphviz (see: -# http://www.graphviz.org/)). +# https://www.graphviz.org/)). # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order # to make the SVG files visible in IE 9+ (other browsers do not have this # requirement). @@ -2586,11 +2707,12 @@ DOT_PATH = DOTFILE_DIRS = -# The MSCFILE_DIRS tag can be used to specify one or more directories that -# contain msc files that are included in the documentation (see the \mscfile -# command). +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. -MSCFILE_DIRS = +DIA_PATH = # The DIAFILE_DIRS tag can be used to specify one or more directories that # contain dia files that are included in the documentation (see the \diafile @@ -2640,18 +2762,6 @@ DOT_GRAPH_MAX_NODES = 100 MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not seem -# to support this out of the box. -# -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). -# The default value is: NO. -# This tag requires that the tag HAVE_DOT is set to YES. - -DOT_TRANSPARENT = YES - # Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) support @@ -2679,3 +2789,19 @@ GENERATE_LEGEND = YES # The default value is: YES. DOT_CLEANUP = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will +# use a built-in version of mscgen tool to produce the charts. Alternatively, +# the MSCGEN_TOOL tag can also specify the name an external tool. For instance, +# specifying prog as the value, doxygen will call the tool as prog -T +# -o . The external tool should support +# output file formats "png", "eps", "svg", and "ismap". + +MSCGEN_TOOL = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the \mscfile +# command). + +MSCFILE_DIRS = diff --git a/dselect/po/bs.po b/dselect/po/bs.po index dbaaffb..282df1f 100644 --- a/dselect/po/bs.po +++ b/dselect/po/bs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-02-17 08:55+0200\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/dselect/po/ca.po b/dselect/po/ca.po index 4babe45..2ffdbf9 100644 --- a/dselect/po/ca.po +++ b/dselect/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-12-17 19:34+0100\n" "Last-Translator: Guillem Jover \n" "Language-Team: Catalan \n" diff --git a/dselect/po/cs.po b/dselect/po/cs.po index 7318cd9..e86aae7 100644 --- a/dselect/po/cs.po +++ b/dselect/po/cs.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-01-26 13:52+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/dselect/po/da.po b/dselect/po/da.po index f30c430..f054ef0 100644 --- a/dselect/po/da.po +++ b/dselect/po/da.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2014-11-27 02:33+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/dselect/po/de.po b/dselect/po/de.po index 1e19408..f1f1fbc 100644 --- a/dselect/po/de.po +++ b/dselect/po/de.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0~\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-04-25 20:26+0200\n" "Last-Translator: Sven Joachim \n" "Language-Team: German \n" diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot index 73a40ae..e55d049 100644 --- a/dselect/po/dselect.pot +++ b/dselect/po/dselect.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg 1.22.7\n" +"Project-Id-Version: dpkg 1.22.8\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/dselect/po/el.po b/dselect/po/el.po index 10be82c..d0e8ee2 100644 --- a/dselect/po/el.po +++ b/dselect/po/el.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-02-17 08:56+0200\n" "Last-Translator: quad-nrg.net \n" "Language-Team: Greek \n" diff --git a/dselect/po/es.po b/dselect/po/es.po index a8f2b63..2d0e3d9 100644 --- a/dselect/po/es.po +++ b/dselect/po/es.po @@ -40,7 +40,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-01-27 22:48+0100\n" "Last-Translator: Javier Fernández-Sanguino \n" "Language-Team: Spanish \n" diff --git a/dselect/po/et.po b/dselect/po/et.po index a9aea10..01bd644 100644 --- a/dselect/po/et.po +++ b/dselect/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.14.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2007-07-13 08:22+0300\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" diff --git a/dselect/po/eu.po b/dselect/po/eu.po index 9dfccae..6734451 100644 --- a/dselect/po/eu.po +++ b/dselect/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.16.8\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2012-09-01 12:21+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" diff --git a/dselect/po/fr.po b/dselect/po/fr.po index 1d5d1fe..b6b59e7 100644 --- a/dselect/po/fr.po +++ b/dselect/po/fr.po @@ -49,7 +49,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-02-05 23:47+0100\n" "Last-Translator: Sébastien Poher \n" "Language-Team: French \n" diff --git a/dselect/po/gl.po b/dselect/po/gl.po index e68a900..c36cb69 100644 --- a/dselect/po/gl.po +++ b/dselect/po/gl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2008-12-27 15:56+0100\n" "Last-Translator: mvillarino \n" "Language-Team: Galician \n" diff --git a/dselect/po/hu.po b/dselect/po/hu.po index 02d94ab..b001219 100644 --- a/dselect/po/hu.po +++ b/dselect/po/hu.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-10-06 03:48+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" diff --git a/dselect/po/id.po b/dselect/po/id.po index cd1b8f1..e2ad53b 100644 --- a/dselect/po/id.po +++ b/dselect/po/id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-10-06 20:20+0700\n" "Last-Translator: Arief S Fitrianto \n" "Language-Team: Indonesian \n" diff --git a/dselect/po/it.po b/dselect/po/it.po index 114254a..ea5b2ec 100644 --- a/dselect/po/it.po +++ b/dselect/po/it.po @@ -42,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.10.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-10-06 22:01+0200\n" "Last-Translator: Stefano Canepa \n" "Language-Team: Italian \n" diff --git a/dselect/po/ja.po b/dselect/po/ja.po index a1ab7d9..ccaf269 100644 --- a/dselect/po/ja.po +++ b/dselect/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2016-03-31 12:44+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" diff --git a/dselect/po/ko.po b/dselect/po/ko.po index de40cec..7b5ddbd 100644 --- a/dselect/po/ko.po +++ b/dselect/po/ko.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-01-29 11:18+0100\n" "Last-Translator: Sangdo Jun \n" "Language-Team: Korean \n" diff --git a/dselect/po/nb.po b/dselect/po/nb.po index f524486..ad4d986 100644 --- a/dselect/po/nb.po +++ b/dselect/po/nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2014-12-05 13:25+0200\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" diff --git a/dselect/po/nl.po b/dselect/po/nl.po index f0647cd..f49303f 100644 --- a/dselect/po/nl.po +++ b/dselect/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-09-11 21:13+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" diff --git a/dselect/po/nn.po b/dselect/po/nn.po index bcea9e1..4f78935 100644 --- a/dselect/po/nn.po +++ b/dselect/po/nn.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-02-17 08:57+0200\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian Nynorsk \n" diff --git a/dselect/po/pl.po b/dselect/po/pl.po index 794b0a4..acf57e7 100644 --- a/dselect/po/pl.po +++ b/dselect/po/pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.15.4\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2014-12-21 20:58+0100\n" "Last-Translator: Łukasz Dulny \n" "Language-Team: Polish \n" diff --git a/dselect/po/pt.po b/dselect/po/pt.po index 0982a3a..b32bcd2 100644 --- a/dselect/po/pt.po +++ b/dselect/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2014-11-30 13:28+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po index 0bfa349..bc03214 100644 --- a/dselect/po/pt_BR.po +++ b/dselect/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2008-06-09 02:53-0300\n" "Last-Translator: Felipe Augusto van de Wiel \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Romanian \n" diff --git a/dselect/po/ru.po b/dselect/po/ru.po index 29fbc1e..c45f4e7 100644 --- a/dselect/po/ru.po +++ b/dselect/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-01-31 22:38+0100\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff --git a/dselect/po/sk.po b/dselect/po/sk.po index c910560..6cc34d0 100644 --- a/dselect/po/sk.po +++ b/dselect/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2012-07-03 01:09+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" diff --git a/dselect/po/sv.po b/dselect/po/sv.po index 0032a9c..face9dc 100644 --- a/dselect/po/sv.po +++ b/dselect/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-10-24 18:29+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" diff --git a/dselect/po/tl.po b/dselect/po/tl.po index 3de74ed..5694671 100644 --- a/dselect/po/tl.po +++ b/dselect/po/tl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2006-02-17 08:58+0200\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" diff --git a/dselect/po/vi.po b/dselect/po/vi.po index 16e1d52..d98b17f 100644 --- a/dselect/po/vi.po +++ b/dselect/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2014-12-01 08:20+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po index 4175e56..b68810c 100644 --- a/dselect/po/zh_CN.po +++ b/dselect/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-01-27 15:29-0500\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) \n" diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po index e801038..d6468f1 100644 --- a/dselect/po/zh_TW.po +++ b/dselect/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dselect 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2023-01-28 15:57+0800\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (traditional) \n" diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am index 862562c..dcf3d46 100644 --- a/lib/dpkg/Makefile.am +++ b/lib/dpkg/Makefile.am @@ -48,6 +48,7 @@ EXTRA_libdpkg_la_DEPENDENCIES += \ endif libdpkg_la_LIBADD = \ + $(PS_LIBS) \ $(Z_LIBS) \ $(LZMA_LIBS) \ $(ZSTD_LIBS) \ diff --git a/lib/dpkg/Makefile.in b/lib/dpkg/Makefile.in index 3c92b54..48a72d1 100644 --- a/lib/dpkg/Makefile.in +++ b/lib/dpkg/Makefile.in @@ -191,7 +191,7 @@ am__DEPENDENCIES_1 = libdpkg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - ../compat/libcompat.la + $(am__DEPENDENCIES_1) ../compat/libcompat.la am_libdpkg_la_OBJECTS = ar.lo arch.lo atomic-file.lo buffer.lo \ c-ctype.lo cleanup.lo color.lo command.lo compress.lo dbdir.lo \ dbmodify.lo db-ctrl-access.lo db-ctrl-format.lo \ @@ -793,6 +793,7 @@ devlib_LTLIBRARIES = libdpkg.la EXTRA_libdpkg_la_DEPENDENCIES = libdpkg.map $(am__append_3) libdpkg_la_LDFLAGS = -no-undefined $(am__append_1) $(am__append_2) libdpkg_la_LIBADD = \ + $(PS_LIBS) \ $(Z_LIBS) \ $(LZMA_LIBS) \ $(ZSTD_LIBS) \ diff --git a/lib/dpkg/execname.c b/lib/dpkg/execname.c index 6529fcf..b43ab99 100644 --- a/lib/dpkg/execname.c +++ b/lib/dpkg/execname.c @@ -37,12 +37,19 @@ #include #include +#if defined(__GNU__) +#include +#include +#endif + #if defined(__APPLE__) && defined(__MACH__) #include #endif #include +#if defined(__sun) #include +#endif #include #if defined(_AIX) && defined(HAVE_STRUCT_PSINFO) @@ -96,15 +103,26 @@ dpkg_get_pid_execname(pid_t pid) lcontents[nread] = '\0'; execname = lcontents; #elif defined(__GNU__) + struct ps_context *pc; struct proc_stat *ps; + error_t err; + + if (pid < 0) + return NULL; + + err = ps_context_create(getproc(), &pc); + if (err) + return NULL; - ps = get_proc_stat(pid, PSTAT_ARGS); - if (ps == NULL) + err = ps_context_find_proc_stat(pc, pid, &ps); + if (err) return NULL; /* On old Hurd systems we have to use the argv[0] value, because * there is nothing better. */ - execname = proc_stat_args(ps); + if (proc_stat_set_flags(ps, PSTAT_ARGS) == 0 && + (proc_stat_flags(ps) & PSTAT_ARGS)) + execname = proc_stat_args(ps); #ifdef PSTAT_EXE /* On new Hurd systems we can use the correct value, as long @@ -116,6 +134,8 @@ dpkg_get_pid_execname(pid_t pid) proc_stat_exe(ps)[0] != '\0') execname = proc_stat_exe(ps); #endif + + ps_context_free(pc); #elif defined(__sun) char filename[64]; struct varbuf vb = VARBUF_INIT; diff --git a/lib/dpkg/libdpkg.pc.in b/lib/dpkg/libdpkg.pc.in index 1a91594..b658d59 100644 --- a/lib/dpkg/libdpkg.pc.in +++ b/lib/dpkg/libdpkg.pc.in @@ -7,5 +7,5 @@ Name: libdpkg Description: Debian package management system library Version: @VERSION@ Libs: -L${libdir} -ldpkg -Libs.private: @MD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ZSTD_LIBS@ @BZ2_LIBS@ +Libs.private: @PS_LIBS@ @MD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ZSTD_LIBS@ @BZ2_LIBS@ Cflags: -I${includedir} diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot index d3b41b4..3d2ab70 100644 --- a/man/po/dpkg-man.pot +++ b/man/po/dpkg-man.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg-man 1.22.7\n" +"Project-Id-Version: dpkg-man 1.22.8\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:10+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ast.po b/po/ast.po index 1626235..e3718e4 100644 --- a/po/ast.po +++ b/po/ast.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.14.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:09+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2015-04-07 09:47+0200\n" "Last-Translator: Marcos Alvarez Costales \n" diff --git a/po/bs.po b/po/bs.po index a1b00fe..d366d65 100644 --- a/po/bs.po +++ b/po/bs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:09+0200\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" "PO-Revision-Date: 2015-04-07 10:02+0200\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/po/ca.gmo b/po/ca.gmo index 13eca65..5f4c15a 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 9b9b595..6b6fac3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,14 +5,14 @@ # Antoni Bella , 2001-2002. # Jordi Mallach , 2002-2006, 2008-2010, 2015. # Jordà Polo , 2006. -# Guillem Jover , 2006-2023. +# Guillem Jover , 2006-2024. # msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.18\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-17 01:09+0200\n" -"PO-Revision-Date: 2023-12-17 20:02+0100\n" +"POT-Creation-Date: 2024-07-21 20:18+0200\n" +"PO-Revision-Date: 2024-07-21 19:57+0200\n" "Last-Translator: Guillem Jover \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -475,16 +475,14 @@ msgstr[0] "hi ha %d fitxer o directori instal·lat actualment.)\n" msgstr[1] "hi ha %d fitxers i directoris instal·lats actualment.)\n" #: lib/dpkg/db-fsys-load.c -#, fuzzy, c-format -#| msgid "cannot open %s" +#, c-format msgid "cannot open %s file" -msgstr "no es pot obrir «%s»" +msgstr "no es pot obrir el fitxer «%s»" #: lib/dpkg/db-fsys-load.c -#, fuzzy, c-format -#| msgid "unable to get file '%s%s' metadata" +#, c-format msgid "cannot get %s file metadata" -msgstr "no es poden obtenir les metadades del fitxer «%s%s»" +msgstr "no es poden obtenir les metadades del fitxer «%s»" #: lib/dpkg/db-fsys-override.c #, c-format @@ -1116,24 +1114,18 @@ msgstr "" "%s" #: lib/dpkg/file.c -#, fuzzy, c-format -#| msgid "" -#| "%s was locked by another process with pid %d\n" -#| "%s" +#, c-format msgid "" "%s was locked by %s process with pid %d\n" "%s" msgstr "" -"%s estava blocada per un altre procés amb pid %d\n" +"%s estava blocada per el procés %s amb pid %d\n" "%s" #: lib/dpkg/file.c -#, fuzzy -#| msgctxt "architecture" -#| msgid "" msgctxt "process" msgid "" -msgstr "" +msgstr "" #: lib/dpkg/file.c #, c-format @@ -2151,11 +2143,8 @@ msgstr "" "no es pot establir el context de seguretat per a l'objecte de fitxer «%s»" #: src/realpath/main.c -#, fuzzy -#| msgid "Type dpkg-trigger --help for help about this utility." msgid "Use --help for help about this utility." -msgstr "" -"Executeu dpkg-trigger --help per a obtenir-ne ajuda sobre aquesta utilitat." +msgstr "Empreu --help per a obtenir ajuda sobre aquesta utilitat." #: src/realpath/main.c src/divert/main.c src/statoverride/main.c #, c-format @@ -2174,15 +2163,12 @@ msgstr "" "o posterior per a les condicions de còpia. No hi ha CAP garantia.\n" #: src/realpath/main.c -#, fuzzy, c-format -#| msgid "" -#| "Usage: %s [
%s
.*)$/$tmpl$1/; + s/^(.*.*)$/$tmpl$1/; print; } @@ -91,7 +91,8 @@ sub box_html { my ($stats) = @_; return sprintf '%.1f %%%d / %d%d%d