- apply patch from Daniel Hartwig to fix a segfault in case
the LongOpt is empty (Closes: #676331)
- fix segfault with empty LongOpt in --no-* branch
+ * ftparchive/apt-ftparchive.cc:
+ - default to putting the Contents-* files below $(SECTION) as apt-file
+ expects them there - thanks Martin-Éric Racine! (Closes: #675827)
[ Justin B Rye ]
* doc/apt-cdrom.8.xml:
<varlistentry><term><option>Contents</option></term>
<listitem><para>
Sets the output Contents file. Defaults to
- <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple
+ <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. If this setting causes multiple
Packages files to map onto a single Contents file (as is the default)
then <command>apt-ftparchive</command> will integrate those package files
together automatically.</para></listitem>
BinDirectory "pool/main" {
Packages "dists/sid/main/binary-i386/Packages";
Sources "dists/sid/main/source/Sources";
- Contents "dists/sid/Contents-i386";
+ Contents "dists/sid/main/Contents-i386";
}
// This is the same for the contrib section
BinDirectory "pool/contrib" {
Packages "dists/sid/contrib/binary-i386/Packages";
Sources "dists/sid/contrib/source/Sources";
- Contents "dists/sid/Contents-i386";
+ Contents "dists/sid/contrib/Contents-i386";
}
// This is the same for the non-free section
BinDirectory "pool/non-free" {
Packages "dists/sid/non-free/binary-i386/Packages";
Sources "dists/sid/non-free/source/Sources";
- Contents "dists/sid/Contents-i386";
+ Contents "dists/sid/non-free/Contents-i386";
};
// By default all Packages should have the extension ".deb"
msgstr ""
"Project-Id-Version: apt-doc 0.9.5.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-06-09 22:05+0300\n"
+"POT-Creation-Date: 2012-06-09 23:05+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: apt-ftparchive.1.xml:307
msgid ""
"Sets the output Contents file. Defaults to "
-"<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
-"multiple Packages files to map onto a single Contents file (as is the "
+"<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. If this setting "
+"causes multiple Packages files to map onto a single Contents file (as is the "
"default) then <command>apt-ftparchive</command> will integrate those "
"package files together automatically."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
msgstr ""
-"setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/Contents-"
+"setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/Contents-"
"$(ARCH)</filename>. Wenn diese Einstellung bewirkt, dass mehrere Packages-"
"Dateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie es "
"Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien "
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
msgstr ""
"Define el fichero «Contents» de salida. El valor predeterminado es <filename>"
-"$(DIST)/Contents-$(ARCH)</filename>. Si este valor causa que varios ficheros "
+"$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. Si este valor causa que varios ficheros "
"«Packages» se relacionen en un único fichero «Contents» (el comportamiento "
"predeterminado), <command>apt-ftparchive</command> integrará automáticamente "
"esos ficheros de paquete juntos."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:307
msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (as is the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
string DIPrfx = Setup.Find("TreeDefault::InternalPrefix",
"$(DIST)/$(SECTION)/");
string DContents = Setup.Find("TreeDefault::Contents",
- "$(DIST)/Contents-$(ARCH)");
+ "$(DIST)/$(SECTION)/Contents-$(ARCH)");
string DContentsH = Setup.Find("TreeDefault::Contents::Header","");
string DBCache = Setup.Find("TreeDefault::BinCacheDB",
"packages-$(ARCH).db");