add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)

diff --git a/debian/changelog b/debian/changelog
index 0902e79c83336c62b09921c1f25d891f51979bb3..2ad9fbdd26cc976ebd9d092de12b2d08f2a27285 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
     - use stable-codename instead of stable in the examples (Closes: #531492)
   * doc/apt_preferences.5.xml:
     - adapt some examples here to use current codenames as well
+    - add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
 
   [ Jari Aalto ]
   * debian/rules:

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 5f8f9fded6654490848619dbf0bf3f62cc826e6d..abcf567445f603ff84ea4350594049df16014320 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -97,6 +97,12 @@ APT::Default-Release "stable";
 algorithm to set the priorities of the versions of a package.  Assign:
 
 <variablelist>
+<varlistentry>
+<term>priority 1</term>
+<listitem><simpara>to the versions coming from archives which in their <filename>Release</filename>
+files are marked as "NotAutomatic: yes" like the debian experimental archive.</simpara></listitem>
+</varlistentry>
+
 <varlistentry>
 <term>priority 100</term>
 <listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
@@ -116,7 +122,9 @@ algorithm to set the priorities of the versions of a package.  Assign:
 
 <para>If the target release has not been specified then APT simply assigns
 priority 100 to all installed package versions and priority 500 to all
-uninstalled package versions.</para>
+uninstalled package versions, expect versions coming from archives which
+in their <filename>Release</filename> files are marked as "NotAutomatic: yes" -
+these versions get the priority 1.</para>
 
 <para>APT then applies the following rules, listed in order of precedence,
 to determine which version of a package to install.