* Merged from the mvo branch

* merged from the lp:~mvo/apt/history branch
* Fix apt-ftparchive(1) wrt description of the "-o" option.
  Thanks to Dann Frazier for the patch. Closes: #273100
* po/LINGUAS. Re-disable Hebrew. Closes: #534992
* po/LINGUAS. Enable Asturian and Lithuanian
* Fix typo in apt-cache.8.xml: nessasarily
* Fix "with with" in apt-get.8.xml
* Fix some of the typos mentioned by the german team
  Closes: #479997
* Polish translation update by Wiktor Wandachowicz
  Closes: #548571
* German translation update by Holger Wansing
  Closes: #551534
* Italian translation update by Milo Casagrande
  Closes: #555797
* Simplified Chinese translation update by Aron Xu 
  Closes: #558737
* Slovak translation update by Ivan Masár
  Closes: #559277

* apt-pkg/packagemanager.cc:
  - add output about pre-depends configuring when debug::pkgPackageManager
    is used
* methods/https.cc:
  - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
    thanks to Brian Thomason for the patch
* merge lp:~mvo/apt/netrc branch, this adds support for a
  /etc/apt/auth.conf that can be used to store username/passwords
  in a "netrc" style file (with the extension that it supports "/"
  in a machine definition). Based on the maemo git branch (Closes: #518473)
  (thanks also to Jussi Hakala and Julian Andres Klode)
* apt-pkg/deb/dpkgpm.cc:
  - add "purge" to list of known actions
* apt-pkg/init.h:
  - add compatibility with old ABI name until the next ABI break
* merge segfault fix from Mario Sanchez Prada, many thanks
  (closes: #561109)
* apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
  - typo fix (LP: #462328)

* cmdline/apt-key:
  - Emit a warning if removed keys keyring is missing and skip associated
    checks (LP: #218971)
* apt-pkg/packagemanager.cc:
  - better debug output for ImmediateAdd with depth and why
  - improve the message shown for failing immediate configuration
* doc/guide.it.sgml: moved to doc/it/guide.it.sgml
* doc/po4a.conf: activate translation of guide.sgml and offline.sgml
* doc/apt.conf.5.xml:
  - provide a few more details about APT::Immediate-Configure
  - briefly document the behaviour of the new https options
* doc/sources.list.5.xml:
  - add note about additional apt-transport-methods
* doc/apt-mark.8.xml:
  - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
* cmdline/apt-get.cc:
  - source should display his final pkg pick (Closes: #249383, #550952)
  - source doesn't need the complete version for match (Closes: #245250)
  - source ignores versions/releases if not available (Closes: #377424)
  - only warn if (free) space overflows (Closes: #522238)
  - add --debian-only as alias for --diff-only
* methods/connect.cc:
  - display also strerror of "wicked" getaddrinfo errors
  - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
    in response to Bernhard R. Link, thanks! (Closes: #505020)
* buildlib/configure.mak, buildlib/config.{sub,guess}:
  - remove (outdated) config.{sub,guess} and use the ones provided
    by the new added build-dependency autotools-dev instead
* configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
  - remove the now obsolete manpage buildsystems
* doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
  - convert all remaining translation to the po4a system
* debian/control:
  - drop build-dependency on docbook-utils and xmlto
  - add build-dependency on autotools-dev
  - bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
  - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
* ftparchive/writer.{cc,h}:
  - add APT::FTPArchive::LongDescription to be able to disable them
* apt-pkg/deb/debsrcrecords.cc:
  - use "diff" filetype for .debian.tar.* files (Closes: #554898)
* methods/rred.cc:
  - rewrite to be able to handle even big patch files
  - adopt optional mmap+iovec patch from Morten Hustveit
    (Closes: #463354) which should speed up a bit. Thanks!
* methods/http{,s}.cc
  - add config setting for User-Agent to the Acquire group,
    thanks Timothy J. Miller! (Closes: #355782)
  - add https options which default to http ones (Closes: #557085)
* debian/apt.cron.daily:
  - check cache size even if we do nothing else otherwise, thanks
    Francesco Poli for patch(s) and patience! (Closes: #459344)
* ftparchive/*:
  - fix a few typos in strings, comments and manpage,
    thanks Karl Goetz! (Closes: #558757)
* cmdline/apt-mark:
  - print an error if a new state file can't be created
    (Closes: #521289) and
  - exit nicely if python-apt is not installed (Closes: #521284)
* doc/de: German translation of manpages (Closes: #552606)
* doc/ various manpages:
  - correct various errors, typos and oddities (Closes: #552535)
* doc/apt-secure.8.xml:
  - replace literal with emphasis tags in Archive configuration
* doc/apt-ftparchive.1.xml:
  - remove informalexample tag which hides the programlisting
* doc/apt-get.8.xml:
  - change equivalent "for" to "to the" (purge command)
  - clarify --fix-broken sentence about specifying packages
* apt-pkg/contib/strutl.h
  - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2.
* build infrastructure:
  - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249)
* doc/apt.conf.5.xml:
  - Deprecate unquoted values, string concatenation and explain what should
    not be written inside a value (quotes,backslash).
  - Restrict option names to alphanumerical characters and "/-:._+".
  - Deprecate #include, we have apt.conf.d nowadays which should be
    sufficient.
* ftparchive/apt-ftparchive.cc:
  - Call setlocale() so translations are actually used.
* debian/apt.conf.autoremove:
  - Add kfreebsd-image-* to the list (Closes: #558803)

1 files changed, 0 insertions, 120 deletions

diff --git a/doc/es/vendors.list.es.5.sgml b/doc/es/vendors.list.es.5.sgml
deleted file mode 100644
index b8b329e79..000000000
--- a/doc/es/vendors.list.es.5.sgml
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.2 del CVS de
-/cvs/debian-doc/manpages/english/apt/vendors.list.5.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>vendors.list</>
-   <manvolnum>5</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>vendors.list</>
-    <refpurpose>Configuración de claves de seguridad de APT</>
- </refnamediv>
- 
- <RefSect1><Title>Descripción</>
-   <para>   
-   La lista de proveedores de paquetes contiene una lista de todos los
-   proveedores cuyos paquetes descargados desee autenticar.
-   Debe de tener la huella digital PGP correspondiente a cada
-   proveedor, de este modo APT puede verificar la firma del fichero
-   <literal>Release</literal> y después la suma de control de cada
-   paquete descargado. Para habilitar la autenticación debe añadir
-   entre llaves el identificador del proveedor (vea más abajo) a cada
-   línea del fichero &sources-list; que replique el repositorio
-   proporcionado por ese proveedor.
-   <para>
-   El formato del fichero es parecido al que usa
-   <command>apt.conf</command>. Consiste de un número arbitrario de
-   bloques, donde cada bloque comienza con una cadena de caracteres
-   que indican el <replaceable/tipo_clave/ y el <replaceable/id_de_proveedor/.
-   <para>
-   Algunos proveedores pueden tener varios bloques definiendo
-   diferentes normas de seguridad para sus distribuciones. Debian, por
-   ejemplo, usa diferentes métodos para firmar las distintas distribuciones.
-   <para>
-   <replaceable/tipo_clave/ es el tipo de comprobación exigido.
-   Actualmente, sólo está disponible el tipo <literal/simple-key/.
-   <para>
-   <replaceable/id_de_proveedor/ es la cadena de carácteres que
-   identifica al proveedor. Es una cadena arbitraria y obligatoria que
-   debe proporcionar para identificar inequívocamente al proveedor
-   listado en este fichero.
-   
-   Ejemplo:
-<informalexample><programlisting>   
-simple-key "juan"
-{
-   Fingerprint "0987AB4378FSD872343298787ACC";
-   Name "Juan Gándara &lt;juan@gandara.com&gt;";
-}						    
-</programlisting></informalexample>
-   
- </RefSect1>
-
- <RefSect1><Title>El tipo simple-key</>
-   <para>   
-   Este tipo de verificación se usa cuando el proveedor tiene una sola
-   clave asegurada que se debe usar para firmar el fichero <literal>
-   Release</literal>. Los siguiente elementos deben de estar presentes:
-   
-   <VariableList>
-     <VarListEntry><Term>Fingerprint</Term>
-     <ListItem><Para>
-     La huella digital PGP para la clave. La huella digital debe
-     expresarse con la notación estándar, con o sin espacios.
-     La opción <option/--fingerprint/ de la orden <CiteRefEntry><RefEntryTitle>
-     <command/gpg/</RefEntryTitle><ManVolNum/1/</CiteRefEntry>
-     mostrará la huella digital de la clave o claves seleccionadas.
-     </VarListEntry>
-     
-     <VarListEntry><Term>Name</Term>
-     <ListItem><Para>
-     Cadena de caracteres que contiene una descripción del propietario
-     de la clave o del proveedor. Puede poner el nombre del proveedor
-     y su <foreignphrase>email</foreignphrase>. La cadena debe de ir
-     entre comillas dobles.
-     </VarListEntry>
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Ficheros</>
-   <para>
-   <filename>/etc/apt/vendors.list</>
- </RefSect1>
- 
- <RefSect1><Title>Véase también</>
-   <para>
-   &sources-list;
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
-
-</refentry>
-