From cb3c3b6fda20ecfe5e6b2644da7391eb03845e91 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 4 Sep 2013 17:04:09 +0200 Subject: EDSP doc: fix typo in Request stanza description --- doc/external-dependency-solver-protocol.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 7a124d8f9..3f2da2195 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -114,12 +114,9 @@ and followed by a mixture of action and preference fields. The value of the **Request:** field is a string describing the EDSP protocol which will be used to communicate. At present, the string must -be `EDSP 0.4`. - -a unique request identifier, such as an -UUID. Request fields are mainly used to identify the beginning of a -request stanza; their actual values are otherwise not used by the EDSP -protocol. +be `EDSP 0.4`. Request fields are mainly used to identify the beginning +of a request stanza; their actual values are otherwise not used by the +EDSP protocol. The following **action fields** are supported in request stanzas: -- cgit v1.2.3 From 25252738d5ad6042b356f2d6bec2ca52ef08a1e2 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 4 Sep 2013 17:06:11 +0200 Subject: EDSP: bump protocol version to 0.5 --- doc/external-dependency-solver-protocol.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 3f2da2195..7d41571de 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -1,4 +1,4 @@ -# APT External Dependency Solver Protocol (EDSP) - version 0.4 +# APT External Dependency Solver Protocol (EDSP) - version 0.5 This document describes the communication protocol between APT and external dependency solvers. The protocol is called APT EDSP, for "APT @@ -114,7 +114,7 @@ and followed by a mixture of action and preference fields. The value of the **Request:** field is a string describing the EDSP protocol which will be used to communicate. At present, the string must -be `EDSP 0.4`. Request fields are mainly used to identify the beginning +be `EDSP 0.5`. Request fields are mainly used to identify the beginning of a request stanza; their actual values are otherwise not used by the EDSP protocol. -- cgit v1.2.3 From caa3279367401965cbdd5e3a41c47945f3e263bd Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Wed, 4 Sep 2013 17:13:49 +0200 Subject: EDSP: add Architecture(s) multi-arch fields to the Request stanza --- doc/external-dependency-solver-protocol.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 7d41571de..477bc23ed 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -110,7 +110,8 @@ Within a dependency solving scenario, a request represents the action on installed packages requested by the user. A request is a single Deb 822 stanza opened by a mandatory Request field -and followed by a mixture of action and preference fields. +and followed by a mixture of action, preference, and global +configuration fields. The value of the **Request:** field is a string describing the EDSP protocol which will be used to communicate. At present, the string must @@ -118,6 +119,16 @@ be `EDSP 0.5`. Request fields are mainly used to identify the beginning of a request stanza; their actual values are otherwise not used by the EDSP protocol. +The following **configuration fields** are supported in request stanzas: + +- **Architecture:** (mandatory) The name of the *native* architecture on + the user machine (see also: `dpkg --print-architecture`) + +- **Architectures:** (optional, defaults to the native architecture) A + space separated list of *all* architectures known to APT (this is + roughly equivalent to the union of `dpkg --print-architecture` and + `dpkg --print-foreign-architectures`) + The following **action fields** are supported in request stanzas: - **Install:** (optional, defaults to the empty string) A space -- cgit v1.2.3 From b5ea5d4a5b8f82afb7bbe4c3eee07ae36f2fba9c Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Thu, 5 Sep 2013 10:54:12 +0200 Subject: EDSP: add APT-Release field to Package stanzas --- doc/external-dependency-solver-protocol.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 477bc23ed..790f2f1ee 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -209,6 +209,15 @@ field. The following fields are supported in package stanzas: should be removed by the solver only when the Autoremove action is requested (see Request section). +- **APT-Release:** (optional) The releases the package belongs to, according to + APT. The format of this field is multiline with one value per line and the + first line (the one containing the field name) empty. Each subsequent line + corresponds to one of the releases the package belongs to and looks like + this: `o=Debian,a=unstable,n=sid,l=Debian,c=main`. That is, each release line + is a comma-separated list of "key=value" pairs, each of which denotes a + Release file entry (Origin, Label, Codename, etc.) in the format of + APT_PREFERENCES(5). + ### Answer An answer from the external solver to APT is either a *solution* or an -- cgit v1.2.3 From d8ad0e30f50778e645184485f3030599a01d366b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Jun 2014 15:59:15 +0200 Subject: release 1.0.4 --- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b25cd7375..3f2a692dd 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -225,7 +225,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 9294cca97..e79578ded 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.3\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-05-05 16:26+0200\n" +"POT-Creation-Date: 2014-06-10 15:25+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 From eea0f3a6197dba565c5df349ed06c0a70b49b77f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Jun 2014 18:27:34 +0200 Subject: really release 1.0.4 --- doc/apt-verbatim.ent | 2 +- doc/po/apt-doc.pot | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 3f2a692dd..51ad08b83 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -225,7 +225,7 @@ "> - + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index e79578ded..a058e6506 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.0.3\n" +"Project-Id-Version: apt-doc 1.0.4~20140610\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-06-10 15:25+0200\n" +"POT-Creation-Date: 2014-06-10 15:59+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 From 7f3fa3f5a84a53114b88806dc721cf293063ac68 Mon Sep 17 00:00:00 2001 From: Chris Leick Date: Tue, 17 Jun 2014 21:05:41 +0200 Subject: Updated translation of german documentation --- doc/po/de.po | 121 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 61 insertions(+), 60 deletions(-) (limited to 'doc') diff --git a/doc/po/de.po b/doc/po/de.po index e5b61da60..b048d9661 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -1,14 +1,14 @@ -# Translation of apt-doc to German +# Translation of apt/doc to German # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# This file is distributed under the same license as the apt-doc package. +# This file is distributed under the same license as the apt package. # Chris Leick , 2009-2014. # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.9.16\n" +"Project-Id-Version: apt-doc 1.0.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2014-05-05 16:26+0200\n" -"PO-Revision-Date: 2014-04-01 14:00+0200\n" +"PO-Revision-Date: 2014-06-12 20:31+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" "Language: de\n" @@ -633,7 +633,7 @@ msgstr "APT" #. type: Content of: #: apt.8.xml:32 msgid "command-line interface" -msgstr "" +msgstr "Befehlszeilenschnittstelle" #. type: Content of: #: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39 @@ -652,6 +652,11 @@ msgid "" "management of the system. See also &apt-get; and &apt-cache; for more low-" "level command options." msgstr "" +"<command>apt</command> (Advanced Package Tool, auf Deutsch »fortschrittliches " +"Paketwerkzeug«) ist das Befehlszeilenwerkzeug für den Umgang mit Paketen. Es " +"stellt eine Befehlszeilenschnittstelle zur Verwaltung von Paketen auf dem " +"System bereit. Weitere untergeordnete Befehlsoptionen finden sie unter " +"&apt-get; und &apt-cache;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:47 @@ -661,6 +666,10 @@ msgid "" "<option>--installed</option>, <option>--upgradable</option>, <option>--all-" "versions</option> are supported." msgstr "" +"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es " +"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die " +"folgenden Optionen werden unterstützt: <option>--installed</option>, " +"<option>--upgradable</option>, <option>--all-versions</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:58 @@ -668,19 +677,17 @@ msgid "" "<literal>search</literal> searches for the given term(s) and display " "matching packages." msgstr "" +"<literal>search</literal> sucht nach angegebenen Begriffen und zeigt passende " +"Pakete an." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:64 -#, fuzzy -#| msgid "" -#| "<literal>rdepends</literal> shows a listing of each reverse dependency a " -#| "package has." msgid "" "<literal>show</literal> shows the package information for the given " "package(s)." msgstr "" -"<literal>rdepends</literal> zeigt eine Liste von jeder " -"Rückwärtsabhängigkeit, die ein Paket hat." +"<literal>show</literal> zeigt die Paketinformationen für die angegebenen " +"Pakete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:71 @@ -688,6 +695,8 @@ msgid "" "<literal>install</literal> is followed by one or more package names desired " "for installation or upgrading." msgstr "" +"<literal>install</literal> ist gefolgt von einem oder mehreren Paketnamen, " +"von denen eine Installation oder ein Upgrade gewünscht wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:75 apt-get.8.xml:118 @@ -728,19 +737,17 @@ msgid "" "<literal>edit-sources</literal> lets you edit your sources.list file and " "provides basic sanity checks." msgstr "" +"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer " +"»sources.list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:99 -#, fuzzy -#| msgid "" -#| "<literal>showhold</literal> is used to print a list of packages on hold " -#| "in the same way as for the other show commands." msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources." msgstr "" -"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter " -"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben." +"<literal>update</literal> wird benutzt, um die Paketindexdateien wieder mit " +"ihren Quellen in Einklang zu bringen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:105 @@ -750,6 +757,11 @@ msgid "" "<filename>/etc/apt/sources.list</filename>. New package will be installed, " "but existing package will never removed." msgstr "" +"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller " +"derzeit auf Ihrem System installierten Pakete von den in " +"<filename>/etc/apt/sources.list</filename> aufgezählten Quellen zu " +"installieren. Dabei werden neue Pakete installiert, existierende jedoch nicht " +"entfernt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.8.xml:114 @@ -758,6 +770,9 @@ msgid "" "also remove installed packages if that is required in order to resolve a " "package conflict." msgstr "" +"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann " +"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines " +"Paketkonflikts nötig ist." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110 @@ -769,7 +784,7 @@ msgstr "Optionen" #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:134 msgid "Script usage" -msgstr "" +msgstr "Skriptaufruf" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:136 @@ -780,11 +795,17 @@ msgid "" "&apt-cache; and &apt-get; via APT options. Please prefer using these " "commands in your scripts." msgstr "" +"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann die " +"Ausgabe zwischen Versionen ändern. Obwohl es versucht, nicht die " +"Abwärtskompatibilität zu unterbrechen, gibt es dafür keine Garantie. Alle " +"Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über " +"APT-Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in " +"Ihren Skripten." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:144 msgid "Differences to &apt-get;" -msgstr "" +msgstr "Unterschiede zu &apt-get;" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:145 @@ -793,20 +814,19 @@ msgid "" "does not need to be backward compatible like &apt-get;. Therefore some " "options are different:" msgstr "" +"Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die " +"Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-get;. " +"Daher unterscheiden sich einige Optionen:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:151 -#, fuzzy -#| msgid "the <literal>Package:</literal> line" msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled." -msgstr "die <literal>Package:</literal>-Zeile" +msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:155 -#, fuzzy -#| msgid "the <literal>Component:</literal> line" msgid "The option <literal>APT::Color</literal> is enabled." -msgstr "die <literal>Component:</literal>-Zeile" +msgstr "Die Option <literal>APT::Color</literal> ist aktiviert." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:159 @@ -814,15 +834,17 @@ msgid "" "A new <literal>list</literal> command is available similar to <literal>dpkg " "--list</literal>." msgstr "" +"Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist <literal>dpkg " +"--list</literal> ähnlich." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.8.xml:164 -#, fuzzy -#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgid "" "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> " "enabled by default." -msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" +msgstr "" +"Bei der Option <literal>upgrade</literal> ist standardmäßig " +"<literal>--with-new-pkgs</literal> aktiviert." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197 @@ -835,18 +857,12 @@ msgstr "Siehe auch" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:175 -#, fuzzy -#| msgid "" -#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-" -#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" -#| "preferences;, the APT Howto." msgid "" "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT " "User's guide in &guidesdir;, &apt-preferences;, the APT Howto." msgstr "" -"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, " -"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, " -"das APT-Howto." +"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die " +"APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><title> #: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137 @@ -857,15 +873,11 @@ msgstr "Diagnose" #. type: Content of: <refentry><refsect1><para> #: apt.8.xml:181 -#, fuzzy -#| msgid "" -#| "<command>apt-get</command> returns zero on normal operation, decimal 100 " -#| "on error." msgid "" "<command>apt</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" -"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal " +"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal " "100 bei Fehlern." #. type: Content of: <refentry><refnamediv><refpurpose> @@ -1766,13 +1778,6 @@ msgstr "" # FIXME s/Item/Items/ #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:535 -#, fuzzy -#| msgid "" -#| "Show user friendly progress information in the terminal window when " -#| "packages are installed, upgraded or removed. For a machine parsable " -#| "version of this data see README.progress-reporting in the apt doc " -#| "directory. Configuration Item: <literal>DpkgPM::Progress</literal> and " -#| "<literal>Dpkg::Progress-Fancy</literal>." msgid "" "Show user friendly progress information in the terminal window when packages " "are installed, upgraded or removed. For a machine parsable version of this " @@ -1783,8 +1788,8 @@ msgstr "" "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn " "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade " "durchgeführt wird. Informationen über eine maschinell auswertbare Version " -"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. " -"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und " +"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. " +"Konfigurationselemente: <literal>Dpkg::Progress</literal> und " "<literal>Dpkg::Progress-Fancy</literal>." #. type: Content of: <refentry><refsect1><title> @@ -5434,6 +5439,10 @@ msgid "" "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or " "<literal>APT::Update::{Pre,Post}-Invoke</literal>." msgstr "" +"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies " +"schließt z.B. die Konfigurationsoptionen " +"<literal>DPkg::{Pre,Post}-Invoke</literal> oder " +"<literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239 @@ -8834,20 +8843,12 @@ msgstr "" "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine " "Entscheidungen können manchmal ziemlich überraschend sein." +# s/package/packages/ #. type: <p></p> #: guide.sgml:163 -#, fuzzy -#| msgid "" -#| "<prgn>apt-get</prgn> has several command line options that are detailed " -#| "in its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " -#| "option is <tt>-d</tt> which does not install the fetched files. If the " -#| "system has to download a large number of package it would be undesired to " -#| "start installing them in case something goes wrong. When <tt>-d</tt> is " -#| "used the downloaded archives can be installed by simply running the " -#| "command that caused them to be downloaded again without <tt>-d</tt>." msgid "" "<prgn>apt-get</prgn> has several command line options that are detailed in " -"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful " +"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful " "option is <tt>-d</tt> which does not install the fetched files. If the " "system has to download a large number of package it would be undesired to " "start installing them in case something goes wrong. When <tt>-d</tt> is used " -- cgit v1.2.3