Commit 01923641 authored by Julian Andres Klode's avatar Julian Andres Klode Committed by Lorenzo "Palinuro" Faletra

Import Debian version 2.1.11

apt (2.1.11) unstable; urgency=medium
.
  [ JCGoran ]
  * Fix "extended_states" typo in apt-mark(8) (Closes: #969086)
.
  [ Julian Andres Klode ]
  * doc: Bump Ubuntu release from focal to groovy
  * Do not produce late error if immediate configuration fails, just warn
    (Closes: #953260, #972552) (LP: #1871268)
.
  [ Frans Spiesschaert ]
  * Dutch manpages translation update (Closes: #970037)
parent 0a35c811
Pipeline #1436 failed with stages
......@@ -204,7 +204,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,i
# Configure some variables like package, version and architecture.
set(PACKAGE ${PROJECT_NAME})
set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
set(PACKAGE_VERSION "2.1.10")
set(PACKAGE_VERSION "2.1.11")
string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
if (NOT DEFINED DPKG_DATADIR)
......
......@@ -1007,7 +1007,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
if (Immediate == true) {
// Perform immediate configuration of the package.
if (SmartConfigure(Pkg, Depth + 1) == false)
_error->Error(_("Could not perform immediate configuration on '%s'. "
_error->Warning(_("Could not perform immediate configuration on '%s'. "
"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);
}
......
This diff is collapsed.
......@@ -98,7 +98,7 @@
<listitem><para>
Read/Write package stats from the filename given with the parameter
&synopsis-param-filename; instead of from the default location, which
is <filename>extended_status</filename> in the directory defined
is <filename>extended_states</filename> in the directory defined
by the Configuration Item: <literal>Dir::State</literal>.
</para></listitem>
</varlistentry>
......
......@@ -274,14 +274,14 @@
">
<!-- this will be updated by 'prepare-release' -->
<!ENTITY apt-product-version "2.1.10">
<!ENTITY apt-product-version "2.1.11">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "stretch">
<!ENTITY debian-stable-codename "buster">
<!ENTITY debian-testing-codename "bullseye">
<!ENTITY debian-stable-version "10">
<!ENTITY ubuntu-codename "focal">
<!ENTITY ubuntu-codename "groovy">
<!-- good and bad just refers to matching and not matching a pattern…
It is not a remark about the specific perl version.
......
......@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: apt-doc 2.1.10\n"
"Project-Id-Version: apt-doc 2.1.11\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2020-08-11 14:34+0200\n"
"POT-Creation-Date: 2020-10-21 12:01+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"
......@@ -2284,7 +2284,7 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
......
......@@ -3214,12 +3214,12 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"schreibt/liest Paketstatus von dem Dateinamen, der mit dem Parameter "
"&synopsis-param-filename;, anstatt vom Standardort, der "
"<filename>extended_status</filename> im von Konfigurationselement "
"<filename>extended_states</filename> im von Konfigurationselement "
"<literal>Dir::State</literal> definierten Verzeichnis, angegeben ist."
#. type: Content of: <refentry><refsect1><title>
......
......@@ -3220,12 +3220,12 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Escribe y lee las estadísticas de los paquetes con el nombre de fichero "
"definido con el parámetro &synopsis-param-filename;, en lugar de la "
"ubicación predeterminada, que es <filename>extended_status</filename> en el "
"ubicación predeterminada, que es <filename>extended_states</filename> en el "
"directorio definido con la opción de configuración: <literal>Dir::State</"
"literal>."
......
......@@ -3191,11 +3191,11 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Lecture/écriture des statistiques d'un paquet dans &synopsis-param-filename; "
"au lieu du fichier par défaut (<filename>extended_status</filename> dans le "
"au lieu du fichier par défaut (<filename>extended_states</filename> dans le "
"répertoire défini par l'élément de configuration <literal>Dir::State</"
"literal>)."
......
......@@ -3214,12 +3214,12 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Legge/Scrive le statistiche sui pacchetti dal file specificato con il "
"parametro &synopsis-param-filename; invece che dalla posizione predefinita "
"che è <filename>extended_status</filename> nella directory definita dalla "
"che è <filename>extended_states</filename> nella directory definita dalla "
"voce di configurazione <literal>Dir::State</literal>."
#. type: Content of: <refentry><refsect1><title>
......
......@@ -3107,11 +3107,11 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
"トリの <filename>extended_status</filename>) ではなく、パラメータ &synopsis-"
"トリの <filename>extended_states</filename>) ではなく、パラメータ &synopsis-"
"param-filename; からパッケージの状態を読み書きします。"
#. type: Content of: <refentry><refsect1><title>
......
......@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 2.1.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2020-08-04 12:40+0200\n"
"PO-Revision-Date: 2020-05-24 16:39+0200\n"
"POT-Creation-Date: 2020-09-10 22:28+0200\n"
"PO-Revision-Date: 2020-08-18 22:34+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\n"
......@@ -1979,7 +1979,7 @@ msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
"Pakketten die reeds met hun nieuwste versie geïnstalleerd zijn opnieuw "
"Pakketten die reeds met hun nieuwste versie geïnstalleerd zijn, opnieuw "
"installeren. Configuratie-item: <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
......@@ -2032,10 +2032,10 @@ msgid ""
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
"Voer enkel 'banale' operaties uit. Logisch gezien kan men dit beschouwen als "
"gerelateerd aan <option>--assume-yes</option>. Waar <option>--assume-yes</"
"option> op elke vraag ja antwoordt, zal <option>--trivial-only</option> nee "
"antwoorden. Configuratie-item: <literal>APT::Get::Trivial-Only</literal>."
"Enkel 'banale' operaties uitvoeren. Logisch gezien kan men dit beschouwen "
"als gerelateerd aan <option>--assume-yes</option>. Waar <option>--assume-"
"yes</option> op elke vraag ja antwoordt, zal <option>--trivial-only</option> "
"nee antwoorden. Configuratie-item: <literal>APT::Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
......@@ -2046,6 +2046,12 @@ msgid ""
"equally to running <command>apt-mark auto</command> for all installed "
"packages. Configuration Item: <literal>APT::Get::Mark-Auto</literal>."
msgstr ""
"Na een succesvolle installatie alle pas geïnstalleerde pakketten markeren "
"als automatisch geïnstalleerd. Dit heeft als effect dat al deze pakketten "
"verwijderd zullen worden wanneer geen handmatig geïnstalleerde pakketten "
"deze nog vereisen. Dit is hetzelfde als het commando <command>apt-mark auto</"
"command> uitvoeren voor alle geïnstalleerde pakketten. Configuratie-item: "
"<literal>APT::Get::Mark-Auto</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml
......@@ -2923,10 +2929,8 @@ msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-key.8.xml
#, fuzzy
#| msgid "APT key management utility"
msgid "Deprecated APT key management utility"
msgstr "Hulpprogramma voor het beheer van de sleutels van APT"
msgstr "Verouderd hulpprogramma voor het beheer van de sleutels van APT"
#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml
......@@ -2949,11 +2953,18 @@ msgid ""
"desired the additional installation of the GNU Privacy Guard suite (packaged "
"in <package>gnupg</package>) is required."
msgstr ""
"Het gebruik van <command>apt-key</command> is verouderd, behalve voor het "
"gebruik van <command>apt-key del</command> in scripts van pakketonderhouders "
"om bestaande sleutels te verwijderen uit de hoofdsleutelbos. Indien een "
"dergelijk gebruik van <command>apt-key</command> gewenst is, is bijkomend de "
"installatie vereist van de suite GNU Privacy Guard (verpakt in "
"<package>gnupg</package>)."
#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml
msgid "apt-key(8) will last be available in Debian 11 and Ubuntu 22.04."
msgstr ""
"apt-key(8) zal voor het laatst beschikbaar zijn in Debian 11 en Ubuntu 22.04."
#. type: Content of: <refentry><refsect1><title>
#: apt-key.8.xml
......@@ -3041,10 +3052,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml
#, fuzzy
#| msgid "(deprecated)"
msgid "(mostly deprecated)"
msgstr "(verouderd)"
msgstr "(meestal verouderd)"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml
......@@ -3285,15 +3294,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml
#, fuzzy
#| msgid ""
#| "Read/Write package stats from the filename given with the parameter "
#| "&synopsis-param-filename; instead of from the default location, which is "
#| "<filename>extended_status</filename> in the directory defined by the "
#| "Configuration Item: <literal>Dir::State</literal>."
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"De status van een pakket lezen van/schrijven naar het bestand waarvan de "
"naam opgegeven werd met de parameter &synopsis-param-filename; en geen "
"gebruik maken van de standaardlocatie die <filename>extended_status</"
"gebruik maken van de standaardlocatie die <filename>extended_states</"
"filename> is in de map die vermeld wordt in het configuratie-item: "
"<literal>Dir::State</literal>."
......@@ -13666,24 +13681,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
msgid "Which will use the already fetched archives on the disc."
msgstr ""
"En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
#~ msgid ""
#~ "Note that if usage of <command>apt-key</command> is desired the "
#~ "additional installation of the GNU Privacy Guard suite (packaged in "
#~ "<package>gnupg</package>) is required. For this reason alone the "
#~ "programmatic usage (especially in package maintainer scripts!) is "
#~ "strongly discouraged. Further more the output format of all commands is "
#~ "undefined and can and does change whenever the underlying commands "
#~ "change. <command>apt-key</command> will try to detect such usage and "
#~ "generates warnings on stderr in these cases."
#~ msgstr ""
#~ "Merk op dat als het gebruik van het commando <command>apt-key</command> "
#~ "gewenst is, dan ook de installatie van de GNU Privacy Guard suite "
#~ "(verpakt in het pakket <package>gnupg</package>) vereist is. Enkel "
#~ "omwille daarvan al wordt het gebruik ervan in programma's (zeker in "
#~ "scripts voor pakketonderhoud) sterk afgeraden. Daarenboven wordt de "
#~ "indeling van de uitvoer van alle commando's onvoorspelbaar en kan die "
#~ "wijzigen telkens wanneer de achterliggende commando's wijzigen. "
#~ "<command>apt-key</command> zal een dergelijk gebruik trachten te "
#~ "detecteren en geeft in dergelijke gevallen waarschuwingen op de standaard "
#~ "foutuitvoer."
......@@ -3269,12 +3269,12 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Informacje o stanie pakietów są czytane z (lub zapisywane do) pliku "
"przekazanego w parametrze &synopsis-param-filename; zamiast z pliku "
"domyślnego, którym jest <filename>extended_status</filename> w katalogu "
"domyślnego, którym jest <filename>extended_states</filename> w katalogu "
"określonym w pliku konfiguracyjnym w pozycji<literal>Dir::State</literal>."
#. type: Content of: <refentry><refsect1><title>
......
......@@ -3206,12 +3206,12 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"Lê/Escreve o estado de pacote a partir do nome de ficheiro dado com o "
"parâmetro &synopsis-param-filename; em vez de o fazer a partir da "
"localização predefinida, a qual é <filename>extended_status</filename> no "
"localização predefinida, a qual é <filename>extended_states</filename> no "
"directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
#. type: Content of: <refentry><refsect1><title>
......
......@@ -2251,7 +2251,7 @@ msgstr ""
msgid ""
"Read/Write package stats from the filename given with the parameter "
"&synopsis-param-filename; instead of from the default location, which is "
"<filename>extended_status</filename> in the directory defined by the "
"<filename>extended_states</filename> in the directory defined by the "
"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
......
......@@ -372,9 +372,6 @@ BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)
// as well as http to https
else if ((Uri.Access == "http" || Uri.Access == "https+http") && tmpURI.Access == "https")
return TRY_AGAIN_OR_REDIRECT;
// allow https to http redirects (for https mirrordirectors with http mirrors)
else if ((Uri.Access == "https" || Uri.Access == "https+http") && tmpURI.Access == "http")
return TRY_AGAIN_OR_REDIRECT;
else
{
auto const tmpplus = tmpURI.Access.find('+');
......
......@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: apt 2.1.10\n"
"Project-Id-Version: apt 2.1.11\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2020-08-11 14:34+0200\n"
"POT-Creation-Date: 2020-10-21 12:01+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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment