// SourcesIndex::SourceInfo - Short 1 liner describing a source /*{{{*/
// ---------------------------------------------------------------------
/* The result looks like:
- http://foo/ stable/main src 1.1.1 (dsc) */
+ http://foo/debian/ stable/main src 1.1.1 (dsc) */
string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const
{
string Res;
- Res = ::URI::SiteOnly(URI) + ' ';
+ Res = ::URI::NoUserPassword(URI) + ' ';
if (Dist[Dist.size() - 1] == '/')
{
if (Dist != "/")
/* */
string debSourcesIndex::Info(const char *Type) const
{
- string Info = ::URI::SiteOnly(URI) + ' ';
+ string Info = ::URI::NoUserPassword(URI) + ' ';
if (Dist[Dist.size() - 1] == '/')
{
if (Dist != "/")
/* This is a shorter version that is designed to be < 60 chars or so */
string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const
{
- string Res = ::URI::SiteOnly(URI) + ' ';
+ string Res = ::URI::NoUserPassword(URI) + ' ';
if (Dist[Dist.size() - 1] == '/')
{
if (Dist != "/")
/* */
string debPackagesIndex::Info(const char *Type) const
{
- string Info = ::URI::SiteOnly(URI) + ' ';
+ string Info = ::URI::NoUserPassword(URI) + ' ';
if (Dist[Dist.size() - 1] == '/')
{
if (Dist != "/")
// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) :
- pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section)
-{
-}
+debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section,
+ char const * const Translation) :
+ pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section),
+ Language(Translation)
+{}
/*}}}*/
// TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/
// ---------------------------------------------------------------------
bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const
{
if (TranslationsAvailable()) {
- string TranslationFile = "Translation-" + LanguageCode();
- new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()),
+ string const TranslationFile = string("Translation-").append(Language);
+ new pkgAcqIndexTrans(Owner, IndexURI(Language),
Info(TranslationFile.c_str()),
TranslationFile);
}
snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str());
else
snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(),
- IndexFile(LanguageCode().c_str()).c_str());
+ IndexFile(Language).c_str());
return S;
}
/*}}}*/
/* */
string debTranslationsIndex::Info(const char *Type) const
{
- string Info = ::URI::SiteOnly(URI) + ' ';
+ string Info = ::URI::NoUserPassword(URI) + ' ';
if (Dist[Dist.size() - 1] == '/')
{
if (Dist != "/")
return Info;
}
/*}}}*/
-bool debTranslationsIndex::HasPackages() const
+bool debTranslationsIndex::HasPackages() const /*{{{*/
{
if(!TranslationsAvailable())
return false;
- return FileExists(IndexFile(LanguageCode().c_str()));
+ return FileExists(IndexFile(Language));
}
-
+ /*}}}*/
// TranslationsIndex::Exists - Check if the index is available /*{{{*/
// ---------------------------------------------------------------------
/* */
bool debTranslationsIndex::Exists() const
{
- return FileExists(IndexFile(LanguageCode().c_str()));
+ return FileExists(IndexFile(Language));
}
/*}}}*/
// TranslationsIndex::Size - Return the size of the index /*{{{*/
unsigned long debTranslationsIndex::Size() const
{
struct stat S;
- if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0)
+ if (stat(IndexFile(Language).c_str(),&S) != 0)
return 0;
return S.st_size;
}
bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
{
// Check the translation file, if in use
- string TranslationFile = IndexFile(LanguageCode().c_str());
+ string TranslationFile = IndexFile(Language);
if (TranslationsAvailable() && FileExists(TranslationFile))
{
FileFd Trans(TranslationFile,FileFd::ReadOnly);
/* */
pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
{
- string FileName = IndexFile(LanguageCode().c_str());
+ string FileName = IndexFile(Language);
pkgCache::PkgFileIterator File = Cache.FileBegin();
for (; File.end() == false; File++)
-apt (0.7.25.4) UNRELEASED; urgency=low
+apt (0.7.26) UNRELEASED; urgency=low
+
+ [ David Kalnischkies ]
+ * [BREAK] add possibility to download and use multiply
+ Translation files, configurable with Acquire::Translation
+ (Closes: #444222, #448216, #550564)
+ * Ignore :qualifiers after package name in build dependencies
+ for now as long we don't understand them (Closes: #558103)
+ * apt-pkg/contrib/mmap.{cc,h}:
+ - extend it to have a growable flag - unused now but maybe...
+ * apt-pkg/pkgcache.h:
+ - use long instead of short for {Ver,Desc}File size,
+ patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
+ * apt-pkg/acquire-item.cc:
+ - allow also to skip the last patch if target is reached,
+ thanks Bernhard R. Link! (Closes: #545699)
+ * ftparchive/writer.{cc,h}:
+ - add APT::FTPArchive::AlwaysStat to disable the too aggressive
+ caching if versions are build multiply times (not recommend)
+ Patch by Christoph Goehre, thanks! (Closes: #463260)
[ Ivan Masár ]
* Slovak translation update. Closes: #568294
- * merged lp:~mvo/apt/history
+
+ [ Michael Vogt ]
++ * [BREAK] merged lp:~mvo/apt/history
+ - this writes a /var/log/apt/history tagfile that contains details
+ from the transaction (complements term.log)
+ * methods/http.cc:
+ - add cache-control headers even if no cache is given to allow
+ adding options for intercepting proxies
+ - add Acquire::http::ProxyAutoDetect configuration that
+ can be used to call a external helper to figure out the
+ proxy configuration and return it to apt via stdout
+ (this is a step towards WPAD and zeroconf/avahi support)
+ * abicheck/
+ - add new abitest tester using the ABI Compliance Checker from
+ http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
- -- David Kalnischkies <kalnischkies@gmail.com> Sat, 13 Feb 2010 01:42:50 +0100
+ [ Robert Collins ]
+ * Change the package index Info methods to allow apt-cache policy to be
+ useful when using several different archives on the same host.
+ (Closes: #329814, LP: #22354)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100
apt (0.7.25.3) unstable; urgency=low
[ David Kalnischkies ]
* apt-pkg/contrib/macros.h:
- - install the header system.h with a new name to be able to use
+ - install the header system.h with a new name to be able to use
it in other headers (Closes: #567662)
* cmdline/acqprogress.cc:
- Set Mode to Medium so that the correct prefix is used.
- generate sha1 and sha256 checksums for dsc (Closes: #567343)
* cmdline/apt-get.cc:
- don't mark as manually if in download only (Closes: #468180)
-
+
-- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100
apt (0.7.25.2) unstable; urgency=low
packages that are not in the extended_states file yet
(closes: #534920)
* ftparchive/writer.{cc,h}:
- - merge crash fix for apt-ftparchive on hurd, thanks to
+ - merge crash fix for apt-ftparchive on hurd, thanks to
Samuel Thibault for the patch (closes: #566664)
[ David Kalnischkies ]
* French manpage translation update
* Russian translation update by Yuri Kozlov
Closes: #564171
-
+
[Chris Leick]
* spot & fix various typos in all manpages
* German manpage translation update
#. type: Plain text
#: apt.ent:362
#, no-wrap
--#| msgid ""
--#| "<!ENTITY file-sourceslist \"\n"
--#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
--#| " <listitem><para>Locations to fetch packages from.\n"
--#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
--#| " </varlistentry>\n"
msgid ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
" traduction est légèrement en retard sur le contenu d'origine.\n"
"\">\n"
--#. The last update date
++#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
"<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
msgid ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
--msgid "The option <option>--db</option> can be used to specify a binary caching DB."
++msgid ""
++"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
"On peut se servir de l'option <option>--db</option> pour demander un cache "
"binaire."
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:155
--msgid "The generate configuration has 4 separate sections, each described below."
--msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
++msgid ""
++"The generate configuration has 4 separate sections, each described below."
++msgstr ""
++"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:157
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
--#| msgid ""
--#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
--#| "source/Sources</filename>"
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
--#| msgid ""
--#| "for i in Sections do \n"
--#| " for j in Architectures do\n"
--#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:351
--#| msgid ""
--#| "When processing a <literal>Tree</literal> section <command>apt-"
--#| "ftparchive</command> performs an operation similar to:"
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
"\" id=\"0\"/>"
msgstr ""
"Quand il exécute la section <literal>Tree</literal>, <command>apt-"
--"ftparchive</command> effectue une opération analogue à : <placeholder type=\"programlisting"
--"\" id=\"0\"/>"
++"ftparchive</command> effectue une opération analogue à : <placeholder type="
++"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
"<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
msgid ""
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-get.8.xml:30
msgid "APT package handling utility -- command-line interface"
--msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
++msgstr ""
++"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:166
--msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
--msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++msgid ""
++"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
++msgstr ""
++"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:167
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
msgid ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
--msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
--msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
++msgid ""
++"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
++msgstr ""
++"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
"<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
#, fuzzy
#| msgid ""
#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
#| "literal>."
--msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
++msgid ""
++"the main configuration file specified by <literal>Dir::Etc::main</literal>"
msgstr ""
"Fichier de configuration d'APT. Élément de configuration : <literal>Dir::"
"Etc::Main</literal>."
#. 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:692
msgid ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:711
--msgid "Print information related to accessing <literal>cdrom://</literal> sources."
++msgid ""
++"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"Affiche les informations concernant les sources de type <literal>cdrom://</"
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
--msgstr "Affiche les informations concernant le téléchargement de paquets par FTP."
++msgstr ""
++"Affiche les informations concernant le téléchargement de paquets par FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:729
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
--msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP."
++msgstr ""
++"Affiche les informations concernant le téléchargement de paquets par HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:740
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:862
--msgid "Log all interactions with the sub-processes that actually perform downloads."
++msgid ""
++"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"Affiche toutes les interactions avec les processus enfants qui se chargent "
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:963
--msgid "Output status messages tracing the steps performed when invoking &dpkg;."
++msgid ""
++"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
--#. ? reading apt.conf
++#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1042
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
msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:101
--msgid "to the versions that are not installed and belong to the target release."
++msgid ""
++"to the versions that are not installed and belong to the target release."
msgstr ""
"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
--msgstr "Détermination de la version des paquets et des propriétés des distributions"
++msgstr ""
++"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:315
#. type: <abstract></abstract>
#: guide.sgml:11
--msgid "This document provides an overview of how to use the the APT package manager."
++msgid ""
++"This document provides an overview of how to use the the APT package manager."
msgstr ""
"Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
"paquets APT."
#. type: <p></p>
#: guide.sgml:447
--msgid "Finally, APT will print out a summary of all the changes that will occur."
--msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
++msgid ""
++"Finally, APT will print out a summary of all the changes that will occur."
++msgstr ""
++"Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
#. type: <example></example>
#: guide.sgml:452
projects / apt.git / commitdiff
