diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:32:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:32:49 +0000 |
| commit | 9155e8d6752d34e4ea3f022ee51e099420517669 (patch) | |
| tree | 61c6261279988bba2de9f629a0ee0bd91b45d32f | |
| parent | Adding upstream version 1.22.9. (diff) | |
| download | dpkg-9155e8d6752d34e4ea3f022ee51e099420517669.tar.xz dpkg-9155e8d6752d34e4ea3f022ee51e099420517669.zip | |
Adding upstream version 1.22.10.upstream/1.22.10
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
104 files changed, 426 insertions, 205 deletions
diff --git a/.dist-vcs-id b/.dist-vcs-id index 0472c98..5a10a19 100644 --- a/.dist-vcs-id +++ b/.dist-vcs-id @@ -1 +1 @@ -82ab77437894fc3201e7e111677e83027c02294a +ef5536cfe24e4c41c6fdc56e4530161fade3887c diff --git a/.dist-version b/.dist-version index d28b1eb..f5ae945 100644 --- a/.dist-version +++ b/.dist-version @@ -1 +1 @@ -1.22.9 +1.22.10 @@ -1,3 +1,233 @@ +commit ef5536cfe24e4c41c6fdc56e4530161fade3887c +Author: Guillem Jover <guillem@debian.org> +Date: Sat Jul 27 05:45:16 2024 +0200 + + Release 1.22.10 + + debian/changelog | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit e4d8d44ddf66f85837c2ffa4525ce1023721ad69 +Author: Guillem Jover <guillem@debian.org> +Date: Sat Jul 27 05:43:38 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 | 2 +- + scripts/po/dpkg-dev.pot | 4 ++-- + scripts/po/es.po | 2 +- + scripts/po/fr.po | 2 +- + scripts/po/nl.po | 2 +- + scripts/po/pl.po | 2 +- + scripts/po/pt.po | 2 +- + scripts/po/ru.po | 2 +- + scripts/po/sv.po | 2 +- + 85 files changed, 89 insertions(+), 89 deletions(-) + +commit 58146a371becc8ef2b10587b2d781fb3bc941bc1 +Author: Guillem Jover <guillem@debian.org> +Date: Sat Jul 27 03:11:48 2024 +0200 + + Revert "scripts/mk: Reduce the number of subprocesses" + + This partially reverts commit e146a68a375453db89bc3b5e816d9405e5fd5634. + + While the reverted commit significantly reduced the amount of + subprocesses, it has caused some breakage on functionality packages were + relying on, some of which is currently hard to diagnose due to make + programming model complexity (at least the regressions for the build + flags), and another set is due to external packages using internal dpkg + macros. In any case the breakage is too big, and for some of the changes + potentially silent. + + Keep the documentation changes from the original patch, and preserve the + newly introduced DEB_TIMESTAMP variable. + + Revert this for now until the situation is more clear. And then it can + be reevaluated how to potentially reintroduce this, perhaps through a + new dpkg-build-api level, if that would require changes in packaging. + + Closes: #1076904, #1077005 + + scripts/mk/architecture.mk | 14 +++++--------- + scripts/mk/buildapi.mk | 6 +----- + scripts/mk/buildflags.mk | 36 +++++++++++++++++++----------------- + scripts/mk/pkg-info.mk | 19 ++++++++----------- + scripts/mk/vendor.mk | 8 ++++---- + 5 files changed, 37 insertions(+), 46 deletions(-) + +commit 3618de586c8f2eeb9003c209bc5563bd6bda1a85 +Author: Guillem Jover <guillem@debian.org> +Date: Fri Jul 26 02:16:56 2024 +0200 + + Dpkg::Changelog: Remove useless escaping for - + + These are not within [] to mark a range, they are literal minus signs. + + scripts/Dpkg/Changelog/Debian.pm | 2 +- + scripts/Dpkg/Changelog/Entry/Debian.pm | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit af10377e240142c65a53816954b2fc814d887fba +Author: Guillem Jover <guillem@debian.org> +Date: Fri Jul 26 02:12:16 2024 +0200 + + Dpkg::Changelog::Entry::Debian: Remove obsolete /o modifier from regex + + This modifier is no longer needed, and its use is now discouraged. + + scripts/Dpkg/Changelog/Entry/Debian.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd4d53d9784b33976ea1177e91ce5ceb896f1d63 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Jul 25 05:04:13 2024 +0200 + + build: Simplify C standard check output + + Do not print that we are checking for features or that we are missing + extensions. Just state that C standard we are looking for. + + m4/dpkg-compiler.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit adc3dd67b3c5580919fc9ee99e2b6ec9819c4640 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Jul 25 17:48:19 2024 +0200 + + build: Fix dpkg_cv_c99 assignment in DPKG_C_C99 macro + + The variable should be assigned a "yes" not a "1". + + m4/dpkg-compiler.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1b562a0e9a2879d9db5855a1988cd3a8ed4e42e0 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Jul 25 23:52:22 2024 +0200 + + build: Fix length for comment bar line after autoconf functions + + The current convention is to use a length matching the function name, + but not its arguments. + + m4/dpkg-arch.m4 | 4 ++-- + m4/dpkg-compiler.m4 | 2 +- + m4/dpkg-funcs.m4 | 2 +- + m4/dpkg-libs.m4 | 4 ++-- + m4/dpkg-progs.m4 | 2 +- + 5 files changed, 7 insertions(+), 7 deletions(-) + +commit f320bc0f8fb92d33c3252f61c4e7eb3fcf9401b9 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Jul 25 04:23:08 2024 +0200 + + build: Use pre-defined macros to check C/C++ conformance requirements + + In addition to the features we might explicitly check for, also use the + pre-defined macros that carry the language standard version currently in + use. + + m4/dpkg-compiler.m4 | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a2f7f85d5b6353291b863cb855b748ada75cb566 +Author: Guillem Jover <guillem@debian.org> +Date: Thu Jul 25 04:41:59 2024 +0200 + + build: Do not define macros for C/C++ standard level + + This is already tracked by pre-defined compiler macros. There is no need + to try to set these ourselves. + + m4/dpkg-compiler.m4 | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit e2b2561766f9948267fd31a74396516c323d9bec +Author: Guillem Jover <guillem@debian.org> +Date: Wed Jul 24 23:23:10 2024 +0200 + + Bump version to 1.22.10 + + debian/changelog | 6 ++++++ + 1 file changed, 6 insertions(+) + commit 82ab77437894fc3201e7e111677e83027c02294a Author: Guillem Jover <guillem@debian.org> Date: Wed Jul 24 23:08:24 2024 +0200 diff --git a/config.h.in b/config.h.in index a14749f..1506b4a 100644 --- a/config.h.in +++ b/config.h.in @@ -46,9 +46,6 @@ /* Define to 1 if you have the `asprintf' function. */ #undef HAVE_ASPRINTF -/* Define to 1 if the compiler supports C99. */ -#undef HAVE_C99 - /* Define to 1 if the 'snprintf' family is C99 conformant */ #undef HAVE_C99_SNPRINTF @@ -63,9 +60,6 @@ /* Define to 1 if you have the <curses.h> header file. */ #undef HAVE_CURSES_H -/* Define to 1 if the compiler supports C++11. */ -#undef HAVE_CXX11 - /* Define to 1 if you have the <cxxabi.h> header file. */ #undef HAVE_CXXABI_H @@ -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.9. +# Generated by GNU Autoconf 2.71 for dpkg 1.22.10. # # Report bugs to <debian-dpkg@lists.debian.org>. # @@ -681,8 +681,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dpkg' PACKAGE_TARNAME='dpkg' -PACKAGE_VERSION='1.22.9' -PACKAGE_STRING='dpkg 1.22.9' +PACKAGE_VERSION='1.22.10' +PACKAGE_STRING='dpkg 1.22.10' 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.9 to adapt to many kinds of systems. +\`configure' configures dpkg 1.22.10 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.9:";; + short | recursive ) echo "Configuration of dpkg 1.22.10:";; 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.9 +dpkg configure 1.22.10 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.9, which was +It was created by dpkg $as_me 1.22.10, 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=82ab77437894fc3201e7e111677e83027c02294a +PACKAGE_VCS_ID=ef5536cfe24e4c41c6fdc56e4530161fade3887c PACKAGE_VCS_TYPE=git @@ -5523,7 +5523,7 @@ fi # Define the identity of the package. PACKAGE='dpkg' - VERSION='1.22.9' + VERSION='1.22.10' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -18704,8 +18704,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports C99 features" >&5 -printf %s "checking whether $CC supports C99 features... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports C99" >&5 +printf %s "checking whether $CC supports C99... " >&6; } if test ${dpkg_cv_c99+y} then : printf %s "(cached) " >&6 @@ -18758,6 +18758,10 @@ main (void) /* Magic __func__ variable. */ printf("%s", __func__); +#if __STDC_VERSION__ < 199901L +#error "Requires C99" +#endif + ; return 0; } @@ -18777,8 +18781,8 @@ printf "%s\n" "$dpkg_cv_c99" >&6; } if test "x$dpkg_cv_c99" != "xyes" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept C99 features" >&5 -printf %s "checking for $CC option to accept C99 features... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept C99" >&5 +printf %s "checking for $CC option to accept C99... " >&6; } if test ${dpkg_cv_c99_arg+y} then : printf %s "(cached) " >&6 @@ -18836,6 +18840,10 @@ main (void) /* Magic __func__ variable. */ printf("%s", __func__); +#if __STDC_VERSION__ < 199901L +#error "Requires C99" +#endif + ; return 0; } @@ -18866,21 +18874,15 @@ printf "%s\n" "$dpkg_cv_c99_arg" >&6; } then : CC="$CC $dpkg_cv_c99_arg" - dpkg_cv_c99=1 + dpkg_cv_c99=yes fi fi - if test "x$dpkg_cv_c99" = "xyes" + if test "x$dpkg_cv_c99" != "xyes" then : - -printf "%s\n" "#define HAVE_C99 1" >>confdefs.h - - -else $as_nop - - as_fn_error $? "unsupported required C99 extensions" "$LINENO" 5 + as_fn_error $? "unsupported required C99" "$LINENO" 5 fi @@ -22757,6 +22759,10 @@ main (void) // Null pointer keyword. void *ptr = nullptr; +#if __cplusplus < 201103L +#error "Requires C++11" +#endif + ; return 0; } @@ -22812,6 +22818,10 @@ main (void) // Null pointer keyword. void *ptr = nullptr; +#if __cplusplus < 201103L +#error "Requires C++11" +#endif + ; return 0; } @@ -22852,15 +22862,8 @@ then : fi fi - if test "x$dpkg_cv_cxx11" = "xyes" -then : -printf "%s\n" "#define HAVE_CXX11 1" >>confdefs.h - - -fi - for ac_prog in gpatch patch do @@ -34314,7 +34317,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.9, which was +This file was extended by dpkg $as_me 1.22.10, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34383,7 +34386,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.9 +dpkg config.status 1.22.10 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/dselect/po/bs.po b/dselect/po/bs.po index 08878b2..83407a9 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-02-17 08:55+0200\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@linux.org.ba>\n" diff --git a/dselect/po/ca.po b/dselect/po/ca.po index 2b531a9..96c0274 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-12-17 19:34+0100\n" "Last-Translator: Guillem Jover <guillem@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" diff --git a/dselect/po/cs.po b/dselect/po/cs.po index 68fe8eb..03de126 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-26 13:52+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" diff --git a/dselect/po/da.po b/dselect/po/da.po index bea500c..949b1ce 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2014-11-27 02:33+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" diff --git a/dselect/po/de.po b/dselect/po/de.po index 1cf9374..c046c71 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-04-25 20:26+0200\n" "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot index 3933427..55041e4 100644 --- a/dselect/po/dselect.pot +++ b/dselect/po/dselect.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg 1.22.9\n" +"Project-Id-Version: dpkg 1.22.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/dselect/po/el.po b/dselect/po/el.po index 8e7277d..ec28407 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-02-17 08:56+0200\n" "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" diff --git a/dselect/po/es.po b/dselect/po/es.po index f56621e..6b12a75 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-27 22:48+0100\n" "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" diff --git a/dselect/po/et.po b/dselect/po/et.po index 3eb227b..69f9a66 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2007-07-13 08:22+0300\n" "Last-Translator: Ivar Smolin <okul@linux.ee>\n" "Language-Team: Estonian <et@li.org>\n" diff --git a/dselect/po/eu.po b/dselect/po/eu.po index 54ab8d1..2da3f09 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2012-09-01 12:21+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n" "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n" diff --git a/dselect/po/fr.po b/dselect/po/fr.po index 4271158..cf0eba2 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-05 23:47+0100\n" "Last-Translator: Sébastien Poher <sebastien@volted.net>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" diff --git a/dselect/po/gl.po b/dselect/po/gl.po index a31f248..6458882 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2008-12-27 15:56+0100\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: Galician <proxecto@trasno.net>\n" diff --git a/dselect/po/hu.po b/dselect/po/hu.po index 0c21f96..0788793 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-10-06 03:48+0100\n" "Last-Translator: SZERVÁC Attila <sas@321.hu>\n" "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n" diff --git a/dselect/po/id.po b/dselect/po/id.po index 5312f84..17208ac 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-10-06 20:20+0700\n" "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n" "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n" diff --git a/dselect/po/it.po b/dselect/po/it.po index 452c2a8..41eab6f 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-10-06 22:01+0200\n" "Last-Translator: Stefano Canepa <sc@linux.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" diff --git a/dselect/po/ja.po b/dselect/po/ja.po index 9fa3a4d..d4945c7 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2016-03-31 12:44+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" diff --git a/dselect/po/ko.po b/dselect/po/ko.po index e59f011..7f7bf58 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-29 11:18+0100\n" "Last-Translator: Sangdo Jun <sebuls@gmail.com>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" diff --git a/dselect/po/nb.po b/dselect/po/nb.po index 5ac2d97..0d9ff6d 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2014-12-05 13:25+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" diff --git a/dselect/po/nl.po b/dselect/po/nl.po index 86dc7d9..c7a5adb 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-09-11 21:13+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" diff --git a/dselect/po/nn.po b/dselect/po/nn.po index e9266ca..f1f6201 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-02-17 08:57+0200\n" "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" diff --git a/dselect/po/pl.po b/dselect/po/pl.po index 850a6f0..f2f305e 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2014-12-21 20:58+0100\n" "Last-Translator: Łukasz Dulny <bartekchom@poczta.onet.pl>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" diff --git a/dselect/po/pt.po b/dselect/po/pt.po index 01daadb..e8927bd 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2014-11-30 13:28+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po index 3bcdc65..2683158 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2008-06-09 02:53-0300\n" "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." diff --git a/dselect/po/ro.po b/dselect/po/ro.po index 92748ef..175b49f 100644 --- a/dselect/po/ro.po +++ b/dselect/po/ro.po @@ -18,7 +18,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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-09-13 20:15+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" diff --git a/dselect/po/ru.po b/dselect/po/ru.po index f1d0c86..714c0c2 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-31 22:38+0100\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" diff --git a/dselect/po/sk.po b/dselect/po/sk.po index a4647da..b6ce1df 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2012-07-03 01:09+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n" diff --git a/dselect/po/sv.po b/dselect/po/sv.po index 3ce2e01..8ad73fa 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-10-24 18:29+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" diff --git a/dselect/po/tl.po b/dselect/po/tl.po index 2bfbba2..f2fe621 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2006-02-17 08:58+0200\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" diff --git a/dselect/po/vi.po b/dselect/po/vi.po index e884125..9830b32 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2014-12-01 08:20+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n" diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po index d6de389..3203bec 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-27 15:29-0500\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po index f050c34..456cb8a 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-28 15:57+0800\n" "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n" "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 index 1b240a4..8859289 100644 --- a/m4/dpkg-arch.m4 +++ b/m4/dpkg-arch.m4 @@ -3,7 +3,7 @@ # Copyright © 2006-2023 Guillem Jover <guillem@debian.org> # _DPKG_ARCHITECTURE([DEB_VAR], [sh_var]) -# --------------------------------------- +# ------------------ # Use dpkg-architecture from the source tree to set sh_var using DEB_VAR for # the target architecture, to avoid duplicating its logic. AC_DEFUN([_DPKG_ARCHITECTURE], [ @@ -49,7 +49,7 @@ AC_DEFUN([DPKG_OS_TYPE], [ ])# DPKG_OS_TYPE # DPKG_ARCHITECTURE -# ------------------------ +# ----------------- # Determine the Debian name for the host operating system, # sets ARCHITECTURE. AC_DEFUN([DPKG_ARCHITECTURE], [ diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 index 756af26..cb1063d 100644 --- a/m4/dpkg-compiler.m4 +++ b/m4/dpkg-compiler.m4 @@ -211,7 +211,7 @@ AC_DEFUN([DPKG_COMPILER_OPTIMIZATIONS], [ ]) # DPKG_TRY_C99([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------------------ +# ------------ # Try compiling some C99 code to see whether it works AC_DEFUN([DPKG_TRY_C99], [ AC_COMPILE_IFELSE([ @@ -253,6 +253,10 @@ AC_DEFUN([DPKG_TRY_C99], [ /* Magic __func__ variable. */ printf("%s", __func__); + +#if __STDC_VERSION__ < 199901L +#error "Requires C99" +#endif ]]) ], [$1], [$2])dnl ])# DPKG_TRY_C99 @@ -261,11 +265,11 @@ AC_DEFUN([DPKG_TRY_C99], [ # ---------- # Check whether the compiler can do C99 AC_DEFUN([DPKG_C_C99], [ - AC_CACHE_CHECK([whether $CC supports C99 features], [dpkg_cv_c99], [ + AC_CACHE_CHECK([whether $CC supports C99], [dpkg_cv_c99], [ DPKG_TRY_C99([dpkg_cv_c99=yes], [dpkg_cv_c99=no]) ]) AS_IF([test "x$dpkg_cv_c99" != "xyes"], [ - AC_CACHE_CHECK([for $CC option to accept C99 features], [dpkg_cv_c99_arg], [ + AC_CACHE_CHECK([for $CC option to accept C99], [dpkg_cv_c99_arg], [ dpkg_cv_c99_arg=none dpkg_save_CC="$CC" for arg in "-std=gnu99" "-std=c99" "-c99" "-AC99" "-xc99=all" \ @@ -282,13 +286,11 @@ AC_DEFUN([DPKG_C_C99], [ ]) AS_IF([test "x$dpkg_cv_c99_arg" != "xnone"], [ CC="$CC $dpkg_cv_c99_arg" - dpkg_cv_c99=1 + dpkg_cv_c99=yes ]) ]) - AS_IF([test "x$dpkg_cv_c99" = "xyes"], [ - AC_DEFINE([HAVE_C99], 1, [Define to 1 if the compiler supports C99.]) - ], [ - AC_MSG_ERROR([unsupported required C99 extensions]) + AS_IF([test "x$dpkg_cv_c99" != "xyes"], [ + AC_MSG_ERROR([unsupported required C99]) ]) ])# DPKG_C_C99 @@ -302,6 +304,10 @@ AC_DEFUN([DPKG_TRY_CXX11], [ ]], [[ // Null pointer keyword. void *ptr = nullptr; + +#if __cplusplus < 201103L +#error "Requires C++11" +#endif ]]) ], [$1], [$2]) AC_LANG_POP([C++])dnl @@ -333,7 +339,4 @@ AC_DEFUN([DPKG_CXX_CXX11], [ dpkg_cv_cxx11=yes ]) ]) - AS_IF([test "x$dpkg_cv_cxx11" = "xyes"], [ - AC_DEFINE([HAVE_CXX11], 1, [Define to 1 if the compiler supports C++11.]) - ])[]dnl ])# DPKG_CXX_CXX11 diff --git a/m4/dpkg-funcs.m4 b/m4/dpkg-funcs.m4 index c480c10..22002b5 100644 --- a/m4/dpkg-funcs.m4 +++ b/m4/dpkg-funcs.m4 @@ -77,7 +77,7 @@ AC_DEFUN([DPKG_FUNC_FSYNC_DIR], [ ]) # DPKG_FUNC_C99_SNPRINTF -# ----------------------- +# ---------------------- # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics AC_DEFUN([DPKG_FUNC_C99_SNPRINTF], [ AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf], [ diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4 index 9ef5263..21858a8 100644 --- a/m4/dpkg-libs.m4 +++ b/m4/dpkg-libs.m4 @@ -26,7 +26,7 @@ AC_DEFUN([DPKG_LIB_MD], [ ])# DPKG_LIB_MD # DPKG_WITH_COMPRESS_LIB(NAME, HEADER, FUNC) -# ------------------------------------------------- +# ---------------------- # Check for availability of a compression library. AC_DEFUN([DPKG_WITH_COMPRESS_LIB], [ AC_ARG_VAR(AS_TR_CPP([$1_LIBS]), [linker flags for $1 library]) @@ -109,7 +109,7 @@ AC_DEFUN([DPKG_LIB_LZMA], [ ])# DPKG_LIB_LZMA # DPKG_LIB_ZSTD -# ------------ +# ------------- # Check for zstd library. AC_DEFUN([DPKG_LIB_ZSTD], [ DPKG_WITH_COMPRESS_LIB([zstd], [zstd.h], [ZSTD_compressStream2]) diff --git a/m4/dpkg-progs.m4 b/m4/dpkg-progs.m4 index cd18ba1..b00f1aa 100644 --- a/m4/dpkg-progs.m4 +++ b/m4/dpkg-progs.m4 @@ -114,7 +114,7 @@ AC_DEFUN([DPKG_PROG_PO4A], [ ])# DPKG_PROG_PO4A # DPKG_PROG_POD2MAN -# -------------- +# ----------------- AC_DEFUN([DPKG_PROG_POD2MAN], [ AC_ARG_VAR([POD2MAN], [pod2man program]) AC_CHECK_PROGS([POD2MAN], [pod2man]) diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot index 11fbda0..db666ac 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.9\n" +"Project-Id-Version: dpkg-man 1.22.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" @@ -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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:47+0200\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." "com>\n" @@ -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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 10:02+0200\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@linux.org.ba>\n" @@ -11,7 +11,7 @@ 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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2024-07-21 19:57+0200\n" "Last-Translator: Guillem Jover <guillem@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-01 23:14+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:48+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.7\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2024-07-17 17:10+0200\n" "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" diff --git a/po/dpkg.pot b/po/dpkg.pot index cead5a2..f8d5400 100644 --- a/po/dpkg.pot +++ b/po/dpkg.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: dpkg 1.22.9\n" +"Project-Id-Version: dpkg 1.22.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:48+0200\n" "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:48+0200\n" "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n" @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.16.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2017-11-08 00:59+0100\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.14.5\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: Ivar Smolin <okul@linux.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n" "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-05 23:47+0100\n" "Last-Translator: Sébastien Poher <sebastien@volted.net>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:49+0200\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-05 23:44+0100\n" "Last-Translator: Nagy Elemér Károly <nagy.elemer.karoly@gmail.com>\n" "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.15\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-06-26 16:12+0200\n" "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n" "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n" @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.19.3\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2018-12-04 12:15+0100\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.18.3\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2022-11-03 20:08+0100\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:50+0200\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-06-26 16:12+0200\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:50+0200\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:50+0200\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Priti Patil <prithisd@gmail.com>\n" "Language-Team: Marathi <janabhaaratii@cdacmumbai.in>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.1\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-12-03 17:45+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-05 23:42+0100\n" "Last-Translator: Quentin PAGÈS <quentinantonin@free.fr>\n" "Language-Team: Occitan\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:51+0200\n" "Last-Translator: A S Alam <apbrar@gmail.com>\n" "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n" @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.20.7\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2021-04-24 19:50+0200\n" "Last-Translator: Łukasz Dulny <bartekchom@poczta.onet.pl>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-04 14:11+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 9471fdf..ad5b45a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:52+0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-10-04 11:08+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-06 00:01+0100\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 10:01+0200\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.22.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2024-04-28 14:30+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-05 23:45+0100\n" "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2015-04-07 09:53+0200\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.17.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2018-01-03 16:44+0300\n" "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n" "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.18.2\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2016-01-14 08:22+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2e5dcaf..331744d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.21.20\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-01-27 15:39-0500\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index b242adf..3dd5949 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,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-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2018-04-15 07:06+0800\n" "Last-Translator: 林博仁 <Buo.Ren.Lin@gmail.com>\n" "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n" diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm index e7dd7c4..051bea7 100644 --- a/scripts/Dpkg/Changelog/Debian.pm +++ b/scripts/Dpkg/Changelog/Debian.pm @@ -200,7 +200,7 @@ sub parse { $self->parse_error($file, $., $error, $_); } $expect = NEXT_OR_EOF; - } elsif (m/^ \-\-/) { + } elsif (m/^ --/) { $self->parse_error($file, $., g_('badly formatted trailer line'), "$_"); } elsif (m/^\s{2,}(?:\S)/) { unless ($expect eq START_CHANGES or $expect eq CHANGES_OR_TRAILER) { diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm index c646fcc..11c0906 100644 --- a/scripts/Dpkg/Changelog/Entry/Debian.pm +++ b/scripts/Dpkg/Changelog/Entry/Debian.pm @@ -70,7 +70,7 @@ my $regex_header = qr{ # day of week ($6), date-time ($7) and this into month name ($8). my $regex_trailer = qr< ^ - \ \-\- # Trailer marker + \ -- # Trailer marker \ (.*) # Maintainer name \ \<(.*)\> # Maintainer email (\ \ ?) # Blanks @@ -84,7 +84,7 @@ my $regex_trailer = qr< ) ) \s*$ # Trailing space ->xo; +>x; my %week_day = map { $_ => 1 } qw(Mon Tue Wed Thu Fri Sat Sun); my @month_abbrev = qw( diff --git a/scripts/mk/architecture.mk b/scripts/mk/architecture.mk index 4f0559c..c2f6a05 100644 --- a/scripts/mk/architecture.mk +++ b/scripts/mk/architecture.mk @@ -6,16 +6,12 @@ ifndef dpkg_architecture_mk_included dpkg_architecture_mk_included = yes -dpkg_architecture_vars = \ -$(foreach machine,BUILD HOST TARGET,\ - $(foreach var,ARCH ARCH_ABI ARCH_LIBC ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE MULTIARCH,\ - DEB_$(machine)_$(var))) +dpkg_lazy_eval ?= $$(or $$(value DPKG_CACHE_$(1)),$$(eval DPKG_CACHE_$(1) := $$(shell $(2)))$$(value DPKG_CACHE_$(1))) -# dpkg-buildpackage sets all variables. Optimize this frequent case. -ifneq (,$(strip $(foreach v,$(dpkg_architecture_vars),$(if $(value $(v)),,1)))) - $(foreach line,$(subst =,?=,$(shell dpkg-architecture)),$(eval $(line))) -endif +dpkg_architecture_setvar = export $(1) ?= $(call dpkg_lazy_eval,$(1),dpkg-architecture -q$(1)) -export $(dpkg_architecture_vars) +$(foreach machine,BUILD HOST TARGET,\ + $(foreach var,ARCH ARCH_ABI ARCH_LIBC ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE MULTIARCH,\ + $(eval $(call dpkg_architecture_setvar,DEB_$(machine)_$(var))))) endif # dpkg_architecture_mk_included diff --git a/scripts/mk/buildapi.mk b/scripts/mk/buildapi.mk index 6b665f3..3a1f164 100644 --- a/scripts/mk/buildapi.mk +++ b/scripts/mk/buildapi.mk @@ -4,11 +4,7 @@ ifndef dpkg_buildapi_mk_included dpkg_buildapi_mk_included = yes # Default API level when not set. -ifndef DPKG_BUILD_API - dpkg_lazy_eval ?= $(eval $(1) = $(2)$$($(1))) - dpkg_lazy_set ?= $(call dpkg_lazy_eval,$(1),$$(eval $(1) := $(2))) - $(call dpkg_lazy_set,DPKG_BUILD_API,$$(shell dpkg-buildapi)) -endif +DPKG_BUILD_API ?= $(shell dpkg-buildapi) # We could use only built-in GNU make functions, but that seems too much # complexity given no integer operators, given that we currently have to diff --git a/scripts/mk/buildflags.mk b/scripts/mk/buildflags.mk index bc04488..1159700 100644 --- a/scripts/mk/buildflags.mk +++ b/scripts/mk/buildflags.mk @@ -35,6 +35,8 @@ dpkg_buildflags_mk_included = yes # This list is kept in sync with the default set of flags returned # by dpkg-buildflags. +dpkg_lazy_eval ?= $$(or $$(value DPKG_CACHE_$(1)),$$(eval DPKG_CACHE_$(1) := $$(shell $(2)))$$(value DPKG_CACHE_$(1))) + DPKG_BUILDFLAGS_LIST := $(foreach var,\ ASFLAGS \ CFLAGS \ @@ -48,26 +50,26 @@ DPKG_BUILDFLAGS_LIST := $(foreach var,\ LDFLAGS \ ,$(var) $(var)_FOR_BUILD) -dpkg_buildflags_run = $(eval $(shell \ - $(foreach exported,\ - DEB_BUILD_OPTIONS \ - DEB_BUILD_MAINT_OPTIONS \ - DEB_BUILD_PATH \ - $(foreach flag,$(DPKG_BUILDFLAGS_LIST),\ - $(foreach operation,SET STRIP APPEND PREPEND,\ - DEB_$(flag)_MAINT_$(operation))),\ - $(if $(value $(exported)),\ - $(exported)="$($(exported))"))\ - dpkg-buildflags | sed 's/\([^=]*\)\(.*\)/$$(eval \1:\2)/')) +define dpkg_buildflags_export_envvar + ifdef $(1) + DPKG_BUILDFLAGS_EXPORT_ENVVAR += $(1)="$$(value $(1))" + endif +endef + +$(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_OPTIONS)) +$(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_MAINT_OPTIONS)) +$(eval $(call dpkg_buildflags_export_envvar,DEB_BUILD_PATH)) +$(foreach flag,$(DPKG_BUILDFLAGS_LIST),\ + $(foreach operation,SET STRIP APPEND PREPEND,\ + $(eval $(call dpkg_buildflags_export_envvar,DEB_$(flag)_MAINT_$(operation))))) + +dpkg_buildflags_setvar = $(1) = $(call dpkg_lazy_eval,$(1),$(DPKG_BUILDFLAGS_EXPORT_ENVVAR) dpkg-buildflags --get $(1)) + +$(foreach flag,$(DPKG_BUILDFLAGS_LIST),\ + $(eval $(call dpkg_buildflags_setvar,$(flag)))) ifdef DPKG_EXPORT_BUILDFLAGS - # We need to compute the values right now. - $(dpkg_buildflags_run) export $(DPKG_BUILDFLAGS_LIST) -else - dpkg_lazy_eval ?= $(eval $(1) = $(2)$$($(1))) - $(foreach v,$(DPKG_BUILDFLAGS_LIST),\ - $(call dpkg_lazy_eval,$(v),$$(dpkg_buildflags_run))) endif endif # dpkg_buildflags_mk_included diff --git a/scripts/mk/pkg-info.mk b/scripts/mk/pkg-info.mk index 37bf422..658e4f6 100644 --- a/scripts/mk/pkg-info.mk +++ b/scripts/mk/pkg-info.mk @@ -21,18 +21,15 @@ ifndef dpkg_pkg_info_mk_included dpkg_pkg_info_mk_included = yes -dpkg_parsechangelog_run = $(eval $(shell dpkg-parsechangelog | sed -n '\ - s/^Distribution: \(.*\)/$$(eval DEB_DISTRIBUTION:=\1)/p;\ - s/^Source: \(.*\)/$$(eval DEB_SOURCE:=\1)/p;\ - s/^Version: \([0-9]*:\)\{0,1\}\([^-]*\)\(\(.*\)-[^-]*\)\{0,1\}$$/\ - $$(eval DEB_VERSION:=\1\2\3)\ - $$(eval DEB_VERSION_EPOCH_UPSTREAM:=\1\2\4)\ - $$(eval DEB_VERSION_UPSTREAM_REVISION:=\2\3)\ - $$(eval DEB_VERSION_UPSTREAM:=\2\4)/p;\ - s/^Timestamp: \(.*\)/$$(eval DEB_TIMESTAMP:=\1)/p')) +dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1))) -# Compute all the values in one go. -$(dpkg_parsechangelog_run) +DEB_SOURCE = $(call dpkg_late_eval,DEB_SOURCE,dpkg-parsechangelog -SSource) +DEB_VERSION = $(call dpkg_late_eval,DEB_VERSION,dpkg-parsechangelog -SVersion) +DEB_VERSION_EPOCH_UPSTREAM = $(call dpkg_late_eval,DEB_VERSION_EPOCH_UPSTREAM,echo '$(DEB_VERSION)' | sed -e 's/-[^-]*$$//') +DEB_VERSION_UPSTREAM_REVISION = $(call dpkg_late_eval,DEB_VERSION_UPSTREAM_REVISION,echo '$(DEB_VERSION)' | sed -e 's/^[0-9]*://') +DEB_VERSION_UPSTREAM = $(call dpkg_late_eval,DEB_VERSION_UPSTREAM,echo '$(DEB_VERSION_EPOCH_UPSTREAM)' | sed -e 's/^[0-9]*://') +DEB_DISTRIBUTION = $(call dpkg_late_eval,DEB_DISTRIBUTION,dpkg-parsechangelog -SDistribution) +DEB_TIMESTAMP = $(call dpkg_late_eval,DEB_TIMESTAMP,dpkg-parsechangelog -STimestamp) SOURCE_DATE_EPOCH ?= $(DEB_TIMESTAMP) export SOURCE_DATE_EPOCH diff --git a/scripts/mk/vendor.mk b/scripts/mk/vendor.mk index d257edd..a8d29cb 100644 --- a/scripts/mk/vendor.mk +++ b/scripts/mk/vendor.mk @@ -41,10 +41,10 @@ ifndef dpkg_datadir endif include $(dpkg_datadir)/buildapi.mk -dpkg_lazy_eval ?= $(eval $(1) = $(2)$$($(1))) -dpkg_lazy_set ?= $(call dpkg_lazy_eval,$(1),$$(eval $(1) := $(2))) -$(call dpkg_lazy_set,DEB_VENDOR,$$(shell dpkg-vendor --query Vendor)) -$(call dpkg_lazy_set,DEB_PARENT_VENDOR,$$(shell dpkg-vendor --query Parent)) +dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1))) + +DEB_VENDOR = $(call dpkg_late_eval,DEB_VENDOR,dpkg-vendor --query Vendor) +DEB_PARENT_VENDOR = $(call dpkg_late_eval,DEB_PARENT_VENDOR,dpkg-vendor --query Parent) dpkg_vendor_derives_from_v0 = dpkg-vendor --derives-from $(1) && echo yes || echo no dpkg_vendor_derives_from_v1 = $(shell $(dpkg_vendor_derives_from_v0)) diff --git a/scripts/po/ca.po b/scripts/po/ca.po index a76d7c9..fa05c4a 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2024-07-21 19:57+0200\n" "Last-Translator: Guillem Jover <guillem@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" diff --git a/scripts/po/de.po b/scripts/po/de.po index 959dff6..ab85b9b 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg-dev 1.22.6\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2024-07-03 21:25+0200\n" "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot index 4e2741a..94c6410 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.9\n" +"Project-Id-Version: dpkg 1.22.10\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2024-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/scripts/po/es.po b/scripts/po/es.po index 7e8a128..f325dee 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/scripts/po/fr.po b/scripts/po/fr.po index 03ea7cb..f638038 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/scripts/po/nl.po b/scripts/po/nl.po index 5692dce..b533265 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2023-02-02 17:51+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: \n" diff --git a/scripts/po/pl.po b/scripts/po/pl.po index a083931..cc4fb95 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/scripts/po/pt.po b/scripts/po/pt.po index 17e05a0..d799ae6 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/scripts/po/ru.po b/scripts/po/ru.po index b061d7f..1e582c8 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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\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" diff --git a/scripts/po/sv.po b/scripts/po/sv.po index 725cfd8..7194de1 100644 --- a/scripts/po/sv.po +++ b/scripts/po/sv.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-07-24 23:02+0200\n" +"POT-Creation-Date: 2024-07-27 05:43+0200\n" "PO-Revision-Date: 2024-04-28 14:34+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" diff --git a/src/at/package.m4 b/src/at/package.m4 index 332b908..4d78255 100644 --- a/src/at/package.m4 +++ b/src/at/package.m4 @@ -1,7 +1,7 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [dpkg]) m4_define([AT_PACKAGE_TARNAME], [dpkg]) -m4_define([AT_PACKAGE_VERSION], [1.22.9]) -m4_define([AT_PACKAGE_STRING], [dpkg 1.22.9]) +m4_define([AT_PACKAGE_VERSION], [1.22.10]) +m4_define([AT_PACKAGE_STRING], [dpkg 1.22.10]) m4_define([AT_PACKAGE_URL], [https://wiki.debian.org/Teams/Dpkg]) m4_define([AT_PACKAGE_BUGREPORT], [debian-dpkg@lists.debian.org]) diff --git a/src/at/testsuite b/src/at/testsuite index ef19fbd..61126b7 100755 --- a/src/at/testsuite +++ b/src/at/testsuite @@ -1000,7 +1000,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -dpkg 1.22.9 test suite: dpkg tools functional test suite test groups: +dpkg 1.22.10 test suite: dpkg tools functional test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1041,7 +1041,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - printf "%s\n" "$as_me (dpkg 1.22.9)" && + printf "%s\n" "$as_me (dpkg 1.22.10)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1240,13 +1240,13 @@ fi exec 5>>"$at_suite_log" # Banners and logs. -printf "%s\n" "## --------------------------------------------------------- ## -## dpkg 1.22.9 test suite: dpkg tools functional test suite. ## -## --------------------------------------------------------- ##" +printf "%s\n" "## ---------------------------------------------------------- ## +## dpkg 1.22.10 test suite: dpkg tools functional test suite. ## +## ---------------------------------------------------------- ##" { - printf "%s\n" "## --------------------------------------------------------- ## -## dpkg 1.22.9 test suite: dpkg tools functional test suite. ## -## --------------------------------------------------------- ##" + printf "%s\n" "## ---------------------------------------------------------- ## +## dpkg 1.22.10 test suite: dpkg tools functional test suite. ## +## ---------------------------------------------------------- ##" echo printf "%s\n" "$as_me: command line was:" @@ -2105,7 +2105,7 @@ _ASBOX printf "%s\n" "Please send $at_msg and all information you think might help: To: <debian-dpkg@lists.debian.org> - Subject: [dpkg 1.22.9] $as_me: $at_msg1$at_msg2 + Subject: [dpkg 1.22.10] $as_me: $at_msg1$at_msg2 You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may |