* ftparchive/apt-ftparchive.cc:

  - default to putting the Contents-* files below $(SECTION) as apt-file
    expects them there - thanks Martin-Éric Racine! (Closes: #675827)

9 files changed, 13 insertions, 13 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 37691fa1f..905bbb997 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 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"
@@ -5358,8 +5358,8 @@ msgstr ""
 #: 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 ""
diff --git a/doc/po/de.po b/doc/po/de.po
index ceb8ee439..03adfbc61 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -8010,12 +8010,12 @@ 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 "
diff --git a/doc/po/es.po b/doc/po/es.po
index 705fb2a80..9b811db96 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -8049,13 +8049,13 @@ 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 ""
 "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."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 4d22e6ee8..dd4ea430c 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -7965,7 +7965,7 @@ 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."
diff --git a/doc/po/it.po b/doc/po/it.po
index 7b9e7dff6..015003796 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -5301,7 +5301,7 @@ 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."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index a38efdf3c..4effb1a7b 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7905,7 +7905,7 @@ 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."
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 9dc093168..4e16f0240 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -7073,7 +7073,7 @@ 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."
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 3fa70a2d6..c900e78c1 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -8026,7 +8026,7 @@ 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."
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index a3f05ae50..b4b0c4f06 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -5767,7 +5767,7 @@ 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."