merged from debian-sid

diff --cc debian/changelog
index ea2ef3510ab7a7df6bc96d573794f6c8806cd254,5ff165cfee96508a8bc3648358bda9937f82c5bc..8e09aa042087528cfcdd8fc382f81cd4f20ecffd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,4 +1,15 @@@
- apt (0.8.7) UNRELEASED; urgency=low
 +apt (0.8.7ubuntu1) UNRELEASED; urgency=low
 +
 +  * merged from debian-unstable, remainging changes:
 +    - use ubuntu keyring and ubuntu archive keyring in apt-key
 +    - run update-apt-xapian-index in apt.cron
 +    - support apt-key net-update and verify keys against master-keyring
 +    - run apt-key net-update in cron.daily
 +    - different example sources.list
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 13 Oct 2010 16:16:01 +0200
 +
+ apt (0.8.7) unstable; urgency=low
  
    [ Manpages translations ]
    * Typo fixed in French (extra "Z"). Thanks to Florentin Duneau.

diff --cc doc/po/fr.po
index b8b9c2ef2c1c5c22452845dabf0d604afca053f5,12b02ac2126979c169f8ecc95b0ee238cdfe884f..ddd1fba836a7ff406e0820ba42e5aba8c7b86af7
--- 1/doc/po/fr.po
--- 2/doc/po/fr.po
+++ b/doc/po/fr.po
@@@ -1095,9 -618,10 +618,9 @@@ msgstr "
  "     <listitem><para>Liste d'état des paquets installés automatiquement.\n"
  "     Élément de configuration : <literal>Dir::State::extended_states</literal>.</para></listitem>\n"
  "     </varlistentry>\n"
 -"\">\n"
  
  #. type: Plain text
- #: apt.ent:377
+ #: apt.ent:191
  #, no-wrap
  msgid ""
  "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@@ -2585,9 -2100,9 +2099,9 @@@ msgstr "
  "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
  "le nombre 100 en cas d'erreur."
  
 -#.  The last update date 
 +#.  The last update date
  #. type: Content of: <refentry><refentryinfo>
- #: apt-ftparchive.1.xml:13
+ #: apt-ftparchive.1.xml:16
  msgid ""
  "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
  "August 2009</date>"
@@@ -3830,9 -3345,9 +3344,9 @@@ msgstr "
  "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
  "nombre 100 en cas d'erreur."
  
 -#.  The last update date 
 +#.  The last update date
  #. type: Content of: <refentry><refentryinfo>
- #: apt-get.8.xml:13
+ #: apt-get.8.xml:16
  msgid ""
  "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
  "November 2008</date>"
@@@ -5218,9 -4733,9 +4732,9 @@@ msgstr "Trousseau des clés fiables sup
  msgid "&apt-get;, &apt-secure;"
  msgstr "&apt-get;, &apt-secure;"
  
 -#.  The last update date 
 +#.  The last update date
  #. type: Content of: <refentry><refentryinfo>
- #: apt-mark.8.xml:13
+ #: apt-mark.8.xml:16
  msgid ""
  "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
  "August 2009</date>"
@@@ -5780,9 -5295,9 +5294,9 @@@ msgstr "
  "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
  "en cas d'erreur."
  
 -#.  The last update date 
 +#.  The last update date
  #. type: Content of: <refentry><refentryinfo>
- #: apt.conf.5.xml:13
+ #: apt.conf.5.xml:16
  msgid ""
  "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
  "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@@ -7680,9 -7195,9 +7194,9 @@@ msgstr "
  
  #.  TODO: provide a
  #.       motivating example, except I haven't a clue why you'd want
 -#.       to do this. 
 +#.       to do this.
  #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
- #: apt.conf.5.xml:746
+ #: apt.conf.5.xml:749
  msgid ""
  "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
  "in CDROM IDs."
@@@ -8103,15 -7618,15 +7617,15 @@@ msgstr "
  msgid "&file-aptconf;"
  msgstr "&file-aptconf;"
  
 -#.  ? reading apt.conf 
 +#.  ? reading apt.conf
  #. type: Content of: <refentry><refsect1><para>
- #: apt.conf.5.xml:1096
+ #: apt.conf.5.xml:1099
  msgid "&apt-cache;, &apt-config;, &apt-preferences;."
  msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
  
 -#.  The last update date 
 +#.  The last update date
  #. type: Content of: <refentry><refentryinfo>
- #: apt_preferences.5.xml:13
+ #: apt_preferences.5.xml:16
  msgid ""
  "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
  msgstr ""