From: Julian Andres Klode <jak@debian.org>
Date: Fri, 14 Aug 2015 08:50:56 +0000 (+0200)
Subject: Merge branch 'debian/experimental' of https://github.com/DonKult/apt into debian... 
X-Git-Tag: 1.1.exp9~42
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/51c4e07f4cba0615ff269b5a8d04dfd3d1313b00?hp=-c

Merge branch 'debian/experimental' of https://github.com/DonKult/apt into debian/experimental
---

51c4e07f4cba0615ff269b5a8d04dfd3d1313b00
diff --combined doc/apt_preferences.5.xml
index 81e0bd220,5ea59bf9c..28b795d43
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@@ -267,7 -267,7 +267,7 @@@ expression surrounded by slashes)
  
  <programlisting>
  Package: gnome* /kde/
- Pin: release n=experimental
+ Pin: release a=experimental
  Pin-Priority: 500
  </programlisting>
  
@@@ -339,21 -339,14 +339,21 @@@ only if there is no installed version o
  <term>P &lt; 0</term>
  <listitem><simpara>prevents the version from being installed</simpara></listitem>
  </varlistentry>
 +<varlistentry>
 +<term>P = 0</term>
 +<listitem><simpara>has undefined behaviour, do not use it.</simpara></listitem>
 +</varlistentry>
  </variablelist>
  </para>
  
 -<para>If any specific-form records match an available package version then the
 -first such record determines the priority of the package version.  
 -Failing that,
 -if any general-form records match an available package version then the
 -first such record determines the priority of the package version.</para>
 +<para>
 +The first specific-form record matching an available package version determines
 +the priority of the package version.
 +Failing that, the priority of the package is defined as the maximum of all
 +priorities defined by generic-form records matching the version.
 +Records defined using patterns in the Pin field other than "*" are treated like
 +specific-form records.
 +</para>
  
  <para>For example, suppose the APT preferences file contains the three
  records presented earlier:</para>
diff --combined doc/po/apt-doc.pot
index 509b5da34,fc3b5a6c6..35db9571d
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@@ -531,8 -531,7 +531,8 @@@ msgid "
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
  "<option>--installed</option>, <option>--upgradable</option>, "
 -"<option>--all-versions</option> are supported."
 +"<option>--upgradeable</option>, <option>--all-versions</option> are "
 +"supported."
  msgstr ""
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -4242,7 -4241,7 +4242,7 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  
diff --combined doc/po/de.po
index bc8d8c899,12d6a4c4d..4f001b85e
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@@ -662,13 -662,13 +662,13 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</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>."
 +"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.8.xml:54
@@@ -6071,11 -6071,11 +6071,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/es.po
index 5cba392d4,9ace0bd4f..84dd3a127
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@@ -36,7 -36,7 +36,7 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: apt 0.9.7.1\n"
+ "Project-Id-Version: apt-doc 1.0.5\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2014-11-06 09:45+0100\n"
  "PO-Revision-Date: 2014-07-04 01:31+0200\n"
@@@ -742,7 -742,7 +742,7 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  
@@@ -6126,11 -6126,11 +6126,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/fr.po
index 66f5e39c3,8d7c29f37..d1e60a655
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -9,7 -9,7 +9,7 @@@
  # Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014.
  msgid ""
  msgstr ""
- "Project-Id-Version: \n"
+ "Project-Id-Version: apt-doc 1.0.5\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2015-03-09 02:17+0100\n"
  "PO-Revision-Date: 2014-11-15 17:26+0100\n"
@@@ -658,7 -658,7 +658,7 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  "La commande <literal>list</literal> est utilisée pour afficher une liste de "
@@@ -6045,11 -6045,11 +6045,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/it.po
index 21fbebd93,21d5611ea..af5fa2914
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@@ -8,7 -8,7 +8,7 @@@
  # Beatrice Torracca <beatricet@libero.it>, 2012, 2014, 2015.
  msgid ""
  msgstr ""
- "Project-Id-Version: \n"
+ "Project-Id-Version: apt-doc 1.0.5\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2015-03-10 09:48+0100\n"
  "PO-Revision-Date: 2015-01-27 14:11+0200\n"
@@@ -710,13 -710,13 +710,13 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  "<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
  "Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
  "pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
 -"<option>--upgradable</option>, <option>--all-versions</option>."
 +"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-versions</option>."
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
  #: apt.8.xml:54
@@@ -6072,11 -6072,11 +6072,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/ja.po
index ba72f0d02,5d6c183cb..a74d2af3a
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@@ -6,7 -6,7 +6,7 @@@
  # KURASAWA Nozomu, 2003-2006, 2009-2012.
  msgid ""
  msgstr ""
- "Project-Id-Version: apt 1.0.6\n"
+ "Project-Id-Version: apt-doc 1.0.6\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2014-11-06 09:45+0100\n"
  "PO-Revision-Date: 2014-07-10 19:52+0900\n"
@@@ -704,12 -704,12 +704,12 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  "パッケージ一覧を表示するには <literal>list</literal> を使います。パッケージ名"
  "のマッチングにシェルパターン、そしてオプション <option>--installed</"
 -"option>、 <option>--upgradable</option>、 <option>--all-versions</option> を"
 +"option>、 <option>--upgradable</option>, <option>--upgradeable</option>、 <option>--all-versions</option> を"
  "サポートしています。"
  
  #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@@ -5812,11 -5812,11 +5812,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/pl.po
index 8081be57b,3d89db060..229ac02c1
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@@ -9,7 -9,7 +9,7 @@@
  # Robert Luberda <robert@debian.org> 2000-2004, 2010, 2012.
  msgid ""
  msgstr ""
- "Project-Id-Version: apt 0.9.7.3\n"
+ "Project-Id-Version: apt-doc 1.0.5\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2014-11-06 09:45+0100\n"
  "PO-Revision-Date: 2014-07-04 02:13+0200\n"
@@@ -700,7 -700,7 +700,7 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  
@@@ -5509,11 -5509,11 +5509,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/pt.po
index 702cae479,dc91fddca..35efdfe30
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@@ -5,7 -5,7 +5,7 @@@
  # Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
  msgid ""
  msgstr ""
- "Project-Id-Version: apt 1.0.7\n"
+ "Project-Id-Version: apt-doc 1.0.7\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2014-11-06 09:45+0100\n"
  "PO-Revision-Date: 2014-08-29 00:34+0100\n"
@@@ -707,7 -707,7 +707,7 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  "<literal>list</literal> é usado para mostrar uma lista de pacotes. Suporta "
@@@ -6007,11 -6007,11 +6007,11 @@@ msgstr "
  #, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  
  #. type: Content of: <refentry><refsect1><refsect2><para>
diff --combined doc/po/pt_BR.po
index 5f03f7dac,b6bd0fe09..9a9f8ec56
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@@ -7,7 -7,7 +7,7 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: apt\n"
+ "Project-Id-Version: apt-doc 1.0.5\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2014-11-06 09:45+0100\n"
  "PO-Revision-Date: 2004-09-20 17:02+0000\n"
@@@ -523,7 -523,7 +523,7 @@@ msgstr "
  msgid ""
  "<literal>list</literal> is used to display a list of packages. It supports "
  "shell pattern for matching package names and the following options: "
 -"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
 +"<option>--installed</option>, <option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
  "versions</option> are supported."
  msgstr ""
  
@@@ -4393,7 -4393,7 +4393,7 @@@ msgstr "
  #, fuzzy, no-wrap
  msgid ""
  "Package: gnome* /kde/\n"
- "Pin: release n=experimental\n"
+ "Pin: release a=experimental\n"
  "Pin-Priority: 500\n"
  msgstr ""
  "<programlisting>\n"
diff --combined po/fr.po
index 2d28ab42b,0e3ae69b1..eb41bb221
--- a/po/fr.po
+++ b/po/fr.po
@@@ -7,7 -7,7 +7,7 @@@
  # Julien Patriarca <leatherface@debian.org>, 2013.
  msgid ""
  msgstr ""
- "Project-Id-Version: fr\n"
+ "Project-Id-Version: apt 1.0.5\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
  "POT-Creation-Date: 2015-03-09 02:17+0100\n"
  "PO-Revision-Date: 2013-12-15 16:45+0100\n"
@@@ -1507,7 -1507,7 +1507,7 @@@ msgstr "
  #. careful with hard to type or special characters (like non-breaking spaces)
  #: apt-private/private-install.cc:195
  msgid "Yes, do as I say!"
 -msgstr "Oui, faites ce que je vous dis !"
 +msgstr "Oui, faites ce que je vous dis !"
  
  #: apt-private/private-install.cc:197
  #, c-format