* ftparchive/apt-ftparchive.cc:

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

13 files changed, 21 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index b263002ae..4641da2b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ apt (0.9.5.2) UNRELEASED; urgency=low
     - 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:
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 1b69c3cfc..91fdfe1e0 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -305,7 +305,7 @@
       <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>
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index c9d352ab6..0d245c0af 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -21,21 +21,21 @@ Default {
 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"
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."
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 4efbecc8c..4b2c3ba12 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -451,7 +451,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
    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");