* merged with otavios branch

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-80
   Merge michael.vogt@ubuntu.com--2005/apt--fixes--0

 * apt@packages.debian.org/apt--main--0--patch-81
   Open 0.6.37

 * apt@packages.debian.org/apt--main--0--patch-82
   merge bubulle@debian.org--2005/apt--main--0

 * apt@packages.debian.org/apt--main--0--patch-83
   Update changelog

 * apt@packages.debian.org/apt--main--0--patch-84
   Fix build of French man pages (now using XML, not SGML)

 * apt@packages.debian.org/apt--main--0--patch-85
   Merge patch from Philippe Batailler for French man page build

 * apt@packages.debian.org/apt--main--0--patch-86
   add Welsh translations from Dafydd Harries

 * apt@packages.debian.org/apt--main--0--patch-87
   Update changelog

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4
   Merge from mainline

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5
   Merge from mainline

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6
   Collapse both pkgAcquire::Run() methods into one, with a default value

 * bubulle@debian.org--2005/apt--main--0--patch-66
   Italian translation complete

 * bubulle@debian.org--2005/apt--main--0--patch-67
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-68
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-69
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-70
   Re-generate the POT and PO files from sources

 * bubulle@debian.org--2005/apt--main--0--patch-71
   Update French translation

 * bubulle@debian.org--2005/apt--main--0--patch-72
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-73
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-74
   Hebres translation update

 * bubulle@debian.org--2005/apt--main--0--patch-75
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-76
   Correct the Hebrew translation for #306658

 * bubulle@debian.org--2005/apt--main--0--patch-77
   Update French man pages translations

 * bubulle@debian.org--2005/apt--main--0--patch-78
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-79
   Correct syntax errors in Hebrew translation

 * bubulle@debian.org--2005/apt--main--0--patch-80
   Revert changes to debian/changelog and debian/apt.cron.daily

 * bubulle@debian.org--2005/apt--main--0--patch-81
   Portuguese translation update

 * daf@muse.19inch.net--2005/apt--main--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-85

 * daf@muse.19inch.net--2005/apt--main--0--patch-1
   add Welsh translation

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1
   * merged obvious fixes into the tree to make it easy for matt to merge

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2
   * more merges from otavio that looks good/uncritical

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3
   * merged Matts misc-abi-changes tree

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4
   * finalized the changelog for a ubuntu build

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26
   * fix the cache-control header generation 

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-18
   Revert changes did by mistake on translation files.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-19
   Merge last changes did from upstream side.

 * otavio@debian.org--2005/apt--ddtp--0.6--patch-20
   Sync with apt--main--0--patch-87

 * otavio@debian.org--2005/apt--fixes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-71

 * otavio@debian.org--2005/apt--fixes--0--patch-1
   Fix comments about the need of xmlto

 * otavio@debian.org--2005/apt--fixes--0--patch-2
   Fix a compile warning

 * otavio@debian.org--2005/apt--fixes--0--patch-3
   Sync with apt--main--0--patch-76

 * otavio@debian.org--2005/apt--fixes--0--patch-4
   Sync with apt--main--0--patch-78

 * otavio@debian.org--2005/apt--fixes--0--patch-5
   Add fixes that was wrongly included on DDTP changes.

 * otavio@debian.org--2005/apt--fixes--0--patch-8
   Add information about the other fixes include on this branch now.

 * otavio@debian.org--2005/apt--fixes--0--patch-9
   Merge last changes from apt--main--0.

 * otavio@debian.org--2005/apt--fixes--0--patch-10
   Fix warnings about min/max change in gcc-4.0

 * otavio@debian.org--2005/apt--fixes--0--patch-11
   Fix remaning warnings while compiling gcc-4.0

 * otavio@debian.org--2005/apt--fixes--0--patch-12
   Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.

 * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1
   Passage sous arch

 * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1
   fix xml error 

1 files changed, 84 insertions, 0 deletions

diff --git a/doc/fr/apt-sortpkgs.fr.1.xml b/doc/fr/apt-sortpkgs.fr.1.xml
new file mode 100644
index 000000000..109a23c48
--- /dev/null
+++ b/doc/fr/apt-sortpkgs.fr.1.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="iso-8859-15" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.fr">
+%aptent;
+
+]>
+
+<refentry lang="fr">
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+
+<refmeta>
+<refentrytitle>apt-sortpkgs</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv lang="fr">
+<refname>apt-sortpkgs</refname><refpurpose>Un outil pour trier les index de paquets.
+ </refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>apt-sortpkgs</command>
+<arg><option>-hvs</option></arg>
+<arg><option>-o=<replaceable>option de configuration</replaceable></option></arg>
+<arg><option>-c=<replaceable>fichier</replaceable></option></arg>
+<arg choice="plain" rep="repeat"><replaceable>fichier</replaceable></arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>   
+<command>Apt-sortpkgs</command> prend un index (un index de Source ou un index de
+paquet) et trie leurs enregistrements selon le nom de paquet. Un tri des
+champs de chaque enregistrement est réalisé selon des règles internes.
+
+   </para>
+<para>
+Le résultat est envoyé sur la sortie standard&nbsp;; l'entrée doit être un 
+fichier analysable.
+ </para>
+</refsect1>
+
+<refsect1><title>Options</title>
+&apt-cmdblurb;
+
+<variablelist>
+<varlistentry><term><option>-s</option></term><term><option>--source</option></term>
+<listitem><para>
+Se servir d'un index de sources pour le tri des champs.
+Élément de configuration&nbsp;: <literal>APT::SortPkgs::Source</literal>.
+     </para></listitem>
+</varlistentry>
+
+&apt-commonoptions;
+</variablelist>
+</refsect1>
+
+<refsect1><title>Voir aussi</title>
+<para>
+&apt-conf;</para>
+</refsect1>
+
+
+<refsect1><title>Diagnostics</title>
+<para>
+<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 en cas 
+d'erreur.
+ </para>
+</refsect1>
+
+&manbugs;
+&traducteur;
+</refentry>
\ No newline at end of file