From 6442107478c5418cd0053eef626f53d565fda7e1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 29 Jul 2021 16:59:52 +0200 Subject: Release 2.3.7 --- CMakeLists.txt | 2 +- debian/changelog | 22 ++++++++++++++++++++++ doc/apt-verbatim.ent | 2 +- doc/apt.conf.5.xml | 2 +- doc/po/apt-doc.pot | 11 ++++++----- doc/po/de.po | 20 +++++++++++++++++--- doc/po/es.po | 20 +++++++++++++++++--- doc/po/fr.po | 20 +++++++++++++++++--- doc/po/it.po | 20 +++++++++++++++++--- doc/po/ja.po | 20 +++++++++++++++++--- doc/po/nl.po | 20 +++++++++++++++++--- doc/po/pl.po | 7 ++++--- doc/po/pt.po | 20 +++++++++++++++++--- doc/po/pt_BR.po | 7 ++++--- po/apt-all.pot | 4 ++-- 15 files changed, 160 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ba48f600..ec2ec066f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,7 +200,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "2.3.6") +set(PACKAGE_VERSION "2.3.7") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index fe2588aec..701a6036e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +apt (2.3.7) experimental; urgency=medium + + [ David Kalnischkies ] + * Use full item description in broken repo error + * Store size from volatile sources for already installed versions + * Restore dpkg::chroot-directory functionality + + [ Dillon Brock ] + * apt.conf(5): indicate # is also used for comments (LP: #1309658) + + [ Julian Andres Klode ] + * Check sources.list could be parsed before adding volatile files + (Closes: #990518) + * pkgAcqIndex::CommonFailed: Set StatIdle before calling Init() + * Implement exponential backoff between retries + - acquire: Automatically reduce select() timeout as needed + - Properly convert PulseInterval to timeval + - Add support for a maximum delay and testing of delay + - tests (retry-downloads): Avoid delay in second test + + -- Julian Andres Klode Thu, 29 Jul 2021 16:59:39 +0200 + apt (2.3.6) experimental; urgency=medium [ David Kalnischkies ] diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 2bc11f1c9..b27b661e6 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -274,7 +274,7 @@ "> - + diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 8a03e91bf..48604b1e4 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; - 2019-04-04T00:00:00Z + 2016-01-03T00:00:00Z diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 1d69fc74f..ab9fa7c16 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 2.3.6\n" +"Project-Id-Version: apt-doc 2.3.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-06-09 13:41+0200\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2957,9 +2957,10 @@ msgid "" "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between " "/* and */, just like C/C++ comments. " -"Each line is of the form APT::Get::Assume-Yes \"true\";. " -"The quotation marks and trailing semicolon are required. The value must be " -"on one line, and there is no kind of string concatenation. Values must not " +"Lines starting with # are also treated as comments. Each " +"line is of the form APT::Get::Assume-Yes \"true\";. The " +"quotation marks and trailing semicolon are required. The value must be on " +"one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " "alphanumeric characters and the characters \"/-:._+\". A new scope can be " "opened with curly braces, like this:" diff --git a/doc/po/de.po b/doc/po/de.po index cd054ee50..47356ff69 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.0.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2020-04-04 08:45+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -4155,12 +4155,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/es.po b/doc/po/es.po index a68ee9eeb..94ebb9360 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -4150,12 +4150,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/fr.po b/doc/po/fr.po index bb964695d..b528b1dbb 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.8.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2019-05-01 17:00+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -4131,12 +4131,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/it.po b/doc/po/it.po index c5dcd8f05..f3002aa4e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2017-03-27 19:05+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" @@ -4154,12 +4154,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/ja.po b/doc/po/ja.po index 7e9b06f2d..68bcb417a 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" @@ -4012,12 +4012,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/nl.po b/doc/po/nl.po index 40b1e4a4e..2f8aced8d 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 2.1.16\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-02-04 21:53+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2021-01-13 12:16+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -4253,12 +4253,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/pl.po b/doc/po/pl.po index d451c58ff..358a8f4e7 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" @@ -4223,8 +4223,9 @@ msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/pt.po b/doc/po/pt.po index eaa8a43be..5e622a505 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.1.16\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-10 22:41+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2021-01-10 19:51+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese <>\n" @@ -4146,12 +4146,26 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml +#, fuzzy +#| msgid "" +#| "Syntactically the configuration language is modeled after what the ISC " +#| "tools such as bind and dhcp use. Lines starting with // are treated as comments (ignored), as well as all text between " +#| "/* and */, just like C/C++ " +#| "comments. Each line is of the form APT::Get::Assume-Yes \"true" +#| "\";. The quotation marks and trailing semicolon are required. " +#| "The value must be on one line, and there is no kind of string " +#| "concatenation. Values must not include backslashes or extra quotation " +#| "marks. Option names are made up of alphanumeric characters and the " +#| "characters \"/-:._+\". A new scope can be opened with curly braces, like " +#| "this:" msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index c6528dafe..2b1de4bec 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-01-08 22:11+0100\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes \n" "Language-Team: \n" @@ -2923,8 +2923,9 @@ msgid "" "Syntactically the configuration language is modeled after what the ISC tools " "such as bind and dhcp use. Lines starting with // are " "treated as comments (ignored), as well as all text between /* and */, just like C/C++ comments. Each line is " -"of the form APT::Get::Assume-Yes \"true\";. The " +"literal> and */, just like C/C++ comments. Lines " +"starting with # are also treated as comments. Each line " +"is of the form APT::Get::Assume-Yes \"true\";. The " "quotation marks and trailing semicolon are required. The value must be on " "one line, and there is no kind of string concatenation. Values must not " "include backslashes or extra quotation marks. Option names are made up of " diff --git a/po/apt-all.pot b/po/apt-all.pot index 3c9510f60..ddf9efa96 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 2.3.6\n" +"Project-Id-Version: apt 2.3.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2021-06-09 13:41+0200\n" +"POT-Creation-Date: 2021-07-29 17:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3-18-g5258