summaryrefslogtreecommitdiff
path: root/ftparchive/apt-ftparchive.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2012-12-26 23:52:47 +0100
committerMichael Vogt <mvo@ubuntu.com>2012-12-26 23:52:47 +0100
commitd2cca6ec46865a1f5167f846e67150dc19ca2022 (patch)
tree43d335f69870a72b97fa41a1b208784b8753d354 /ftparchive/apt-ftparchive.cc
parent7735ad0500b6fefef03b2a3dc2a6843e82353e94 (diff)
parentd663a4c8a8723ae4936d10d0a98ea2c05a29cbc4 (diff)
merged from the debian-sid branch
Diffstat (limited to 'ftparchive/apt-ftparchive.cc')
-rw-r--r--ftparchive/apt-ftparchive.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index f289eb00d..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");
@@ -587,7 +587,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
/* */
bool ShowHelp(CommandLine &CmdL)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+ ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
COMMON_ARCH,__DATE__,__TIME__);
if (_config->FindB("version") == true)
return true;