From: Michael Vogt Date: Thu, 10 Mar 2011 12:22:56 +0000 (+0100) Subject: merged from debian-sid X-Git-Tag: 0.9.13.exp1ubuntu1~208 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/60600564dbf7b48b237d776b514f271a1c091ffa?hp=--cc merged from debian-sid --- 60600564dbf7b48b237d776b514f271a1c091ffa diff --cc debian/changelog index f29452503,32b74267c..da079026e --- a/debian/changelog +++ b/debian/changelog @@@ -1,26 -1,56 +1,79 @@@ + apt (0.8.12) UNRELEASED; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/debindexfile.cc: + - ignore missing deb-src files in /var/lib/apt/lists, thanks + to Thorsten Spindler (LP: #85590) + * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc: + - honor Dpkg::Chroot-Directory in the RunScripts*() methods + * apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}: + - deal with missing FSTAB_DIR when using libudev to discover cdrom + - add experimental APT::cdrom::CdromOnly option (on by default). + When this is set to false apt-cdrom will handle any removable + deivce (like a usb-stick) as a "cdrom/dvd" source + + [ Christian Perrier ] + * Fix error in French translation of manpages (apt_preferences(5)). + Merci, Rémi Vanicat. Closes: #613689 + * Complete French manpage translation + * Italian translation update (Milo Casagrande). Closes: #614395 + + [ David Kalnischkies ] + * ftparchive/multicompress.cc, apt-inst/deb/debfile.cc: + - support xz compressor to create xz-compressed Indexes and be able + to open data.tar.xz files + - load the supported compressors from configuration + * ftparchive/writer.cc: + - ensure that Date and Valid-Until time strings are not localised + - add options to disable specific checksums for Indexes + - include xz-compressed Packages and Sources files in Release file + * apt-pkg/aptconfiguration.cc: + - support download of xz-compressed indexes files + - support adding new compressors by configuration + * apt-pkg/deb/debsrcrecords.cc: + - support xz-compressed source v3 debian.tar files + - support every compression we have a compressor configured + * ftparchive/contents.cc: + - remove ExtractArchive codecopy from apt-inst/deb/debfile.cc + * apt-inst/deb/debfile.cc: + - support data.tar's compressed with any configured compressor + * cmdline/apt-get.cc: + - reinstall dependencies of reinstalled "garbage" (Closes: #617257) + + [ Steve Langasek ] + * apt-pkg/deb/dpkgpm.cc: + - make sure that for multiarch packages, we are passing the full + qualified package name to dpkg for removals. (Closes: #614298) + * Remove the "pseudopackage" handling of Architecture: all packages for + Multi-Arch; instead, Arch: all packages only satisfy dependencies for + the native arch, except where the Arch: all package is declared + Multi-Arch: foreign. (Closes: #613584) + + -- David Kalnischkies Tue, 08 Mar 2011 19:20:56 +0100 + +apt (0.8.11.5ubuntu3) UNRELEASED; urgency=low + + * cherry pick cdrom mount fixes from lp:~mvo/apt/mvo + + -- Michael Vogt Wed, 09 Mar 2011 12:16:32 +0100 + +apt (0.8.11.5ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/debindexfile.cc: + - ignore missing deb-src files in /var/lib/apt/lists, thanks + to Thorsten Spindler (LP: #85590) + * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc: + - honor Dpkg::Chroot-Directory in the RunScripts*() methods + + -- Michael Vogt Thu, 03 Mar 2011 17:39:30 +0100 + +apt (0.8.11.5ubuntu1) natty; urgency=low + + * Merged from debian/sid + + -- Michael Vogt Fri, 18 Feb 2011 12:01:19 +0100 + apt (0.8.11.5) unstable; urgency=low [ Christian Perrier ] diff --cc debian/control index 114241443,ba0901538..36573da4b --- a/debian/control +++ b/debian/control @@@ -1,11 -1,10 +1,11 @@@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , - Luca Bruno , Julian Andres Klode + Julian Andres Klode Standards-Version: 3.9.0 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 diff --cc doc/po/fr.po index f86c65e06,33a118036..3c8f1a8ac --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -9,8 -9,8 +9,8 @@@ msgid "" msgstr "" "Project-Id-Version: \n" --"POT-Creation-Date: 2011-02-14 13:42+0100\n" - "PO-Revision-Date: 2011-02-16 19:38+0100\n" ++"POT-Creation-Date: 2011-03-10 11:35+0100\n" + "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: \n" @@@ -1294,7 -1277,7 +1277,7 @@@ msgstr " "Dir::Cache::pkgcache." #. type: Content of: --#: apt-cache.8.xml:288 apt-ftparchive.1.xml:568 apt-get.8.xml:393 ++#: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 #: apt-sortpkgs.1.xml:61 msgid "" msgstr "" @@@ -1321,12 -1304,12 +1304,12 @@@ msgstr " "Dir::Cache::srcpkgcache." #. type: Content of: --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "" msgstr "" #. type: Content of: --#: apt-cache.8.xml:296 apt-ftparchive.1.xml:542 apt-get.8.xml:383 ++#: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383 msgid "" msgstr "" @@@ -1442,7 -1425,7 +1425,7 @@@ msgstr " "literal>." #. type: Content of: --#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:580 ++#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583 msgid "" msgstr "" @@@ -1562,7 -1545,7 +1545,7 @@@ msgstr " #. type: Content of: #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 --#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608 apt-get.8.xml:570 ++#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 #: apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" @@@ -1580,7 -1563,7 +1563,7 @@@ msgstr "&file-sourceslist; &file-statel #. type: Content of: #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 --#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:624 apt-get.8.xml:585 ++#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 #: apt-key.8.xml:177 apt-mark.8.xml:131 apt-secure.8.xml:185 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:656 #: sources.list.5.xml:234 @@@ -1594,7 -1577,7 +1577,7 @@@ msgstr "&apt-conf;, &sources-list;, &ap #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 --#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:628 apt-get.8.xml:591 ++#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 #: apt-mark.8.xml:135 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostics" @@@ -1729,7 -1712,7 +1712,7 @@@ msgid "Options msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:536 apt-get.8.xml:345 ++#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@@ -1986,7 -1969,7 +1969,7 @@@ msgid "Just show the contents of the co msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> --#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:625 ++#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 #: apt-sortpkgs.1.xml:73 msgid "&apt-conf;" msgstr "&apt-conf;" @@@ -3130,28 -3120,28 +3120,49 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:529 --msgid "<option>--md5</option>" --msgstr "<option>--md5</option>" ++msgid "" ++"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>" ++msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:531 --msgid "" --"Generate MD5 sums. This defaults to on, when turned off the generated index " --"files will not have MD5Sum fields where possible. Configuration Item: " --"<literal>APT::FTPArchive::MD5</literal>" ++#, fuzzy ++#| msgid "" ++#| "Values for the additional metadata fields in the Release file are taken " ++#| "from the corresponding variables under <literal>APT::FTPArchive::Release</" ++#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " ++#| "supported fields are: <literal>Origin</literal>, <literal>Label</" ++#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, " ++#| "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-" ++#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</" ++#| "literal>, <literal>Description</literal>." ++msgid "" ++"Generate the given checksum. These options default to on, when turned off " ++"the generated index files will not have the checksum fields where possible. " ++"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</" ++"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</" ++"replaceable>::<replaceable>Checksum</replaceable></literal> where " ++"<literal>Index</literal> can be <literal>Packages</literal>, " ++"<literal>Sources</literal> or <literal>Release</literal> and " ++"<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</" ++"literal> or <literal>SHA256</literal>." msgstr "" --"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand " --"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où " --"c'est possible. Élément de configuration : <literal>APT::FTPArchive::MD5</" --"literal>." ++"La valeur des autres champs de métadonnées du fichier Release sont tirées de " ++"la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, " ++"p. ex. <literal>APT::FTPArchive::Release::Origin</literal>. Les champs " ++"reconnus sont : <literal>Origin</literal>, <literal>Label</literal>, " ++"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" ++"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, " ++"<literal>Architectures</literal>, <literal>Components</literal>, " ++"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:536 ++#: apt-ftparchive.1.xml:539 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:538 ++#: apt-ftparchive.1.xml:541 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@@ -3161,7 -3151,7 +3172,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:544 ++#: apt-ftparchive.1.xml:547 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@@ -3176,12 -3166,12 +3187,12 @@@ msgstr " "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:550 ++#: apt-ftparchive.1.xml:553 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:552 ++#: apt-ftparchive.1.xml:555 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@@ -3195,12 -3185,12 +3206,12 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:558 ++#: apt-ftparchive.1.xml:561 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:560 ++#: apt-ftparchive.1.xml:563 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@@ -3216,12 -3206,12 +3227,12 @@@ msgstr " "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:568 ++#: apt-ftparchive.1.xml:571 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:570 ++#: apt-ftparchive.1.xml:573 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@@ -3232,12 -3222,12 +3243,12 @@@ msgstr " "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:574 ++#: apt-ftparchive.1.xml:577 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:576 ++#: apt-ftparchive.1.xml:579 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@@ -3246,12 -3236,12 +3257,12 @@@ msgstr " "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:580 ++#: apt-ftparchive.1.xml:583 msgid "<option>--arch</option>" msgstr "<option>--arch</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:581 ++#: apt-ftparchive.1.xml:584 msgid "" "Accept in the <literal>packages</literal> and <literal>contents</literal> " "commands only package files matching <literal>*_arch.deb</literal> or " @@@ -3265,12 -3255,12 +3276,12 @@@ msgstr " "<literal>APT::FTPArchive::Architecture</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:587 ++#: apt-ftparchive.1.xml:590 msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::AlwaysStat</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:589 ++#: apt-ftparchive.1.xml:592 msgid "" "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " @@@ -3293,12 -3283,12 +3304,12 @@@ msgstr " "survenir et l'ensemble de ces contrôles devient inutile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> --#: apt-ftparchive.1.xml:599 ++#: apt-ftparchive.1.xml:602 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> --#: apt-ftparchive.1.xml:601 ++#: apt-ftparchive.1.xml:604 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@@ -3314,19 -3304,19 +3325,19 @@@ msgstr " "generate." #. type: Content of: <refentry><refsect1><title> --#: apt-ftparchive.1.xml:613 apt.conf.5.xml:1087 apt_preferences.5.xml:496 ++#: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:496 #: sources.list.5.xml:198 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> --#: apt-ftparchive.1.xml:619 ++#: apt-ftparchive.1.xml:622 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:615 ++#: apt-ftparchive.1.xml:618 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@@ -3335,7 -3325,7 +3346,7 @@@ msgstr " "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> --#: apt-ftparchive.1.xml:629 ++#: apt-ftparchive.1.xml:632 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@@ -11034,6 -10986,6 +11007,19 @@@ msgstr " # apt-get -o dir::cache::arch msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." ++#~ msgid "<option>--md5</option>" ++#~ msgstr "<option>--md5</option>" ++ ++#~ msgid "" ++#~ "Generate MD5 sums. This defaults to on, when turned off the generated " ++#~ "index files will not have MD5Sum fields where possible. Configuration " ++#~ "Item: <literal>APT::FTPArchive::MD5</literal>" ++#~ msgstr "" ++#~ "Créer la somme de contrôle MD5. Cette option est activée par défaut. " ++#~ "Quand elle est désactivée, les fichiers d'index n'ont pas les champs " ++#~ "MD5Sum là où c'est possible. Élément de configuration : <literal>APT::" ++#~ "FTPArchive::MD5</literal>." ++ #~ msgid "APT package handling utility -- cache manipulator" #~ msgstr "Gestionnaire de paquets APT - manipulation du cache"