diff options
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/apt-ftparchive.cc | 4 | ||||
| -rw-r--r-- | ftparchive/cachedb.cc | 5 | ||||
| -rw-r--r-- | ftparchive/contents.cc | 4 | ||||
| -rw-r--r-- | ftparchive/makefile | 3 | ||||
| -rw-r--r-- | ftparchive/override.cc | 3 | ||||
| -rw-r--r-- | ftparchive/writer.cc | 3 |
6 files changed, 14 insertions, 8 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; diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index a8b637a80..c2318bf53 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -19,11 +19,12 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> - + #include <netinet/in.h> // htonl, etc -#include <apti18n.h> #include "cachedb.h" + +#include <apti18n.h> /*}}}*/ // CacheDB::ReadyDB - Ready the DB2 /*{{{*/ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index bbc5a1e2b..015c790e0 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -38,13 +38,15 @@ #include <apt-pkg/debfile.h> #include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <malloc.h> -#include <apti18n.h> #include "contents.h" + +#include <apti18n.h> /*}}}*/ // GenContents::~GenContents - Free allocated memory /*{{{*/ diff --git a/ftparchive/makefile b/ftparchive/makefile index 504ebf893..c53ecff72 100644 --- a/ftparchive/makefile +++ b/ftparchive/makefile @@ -7,6 +7,7 @@ include ../buildlib/defaults.mak # The apt-ftparchive program ifdef BDBLIB +APT_DOMAIN:=apt-utils PROGRAM=apt-ftparchive SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS) LIB_MAKES = apt-pkg/makefile apt-inst/makefile @@ -15,6 +16,6 @@ SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \ include $(PROGRAM_H) else PROGRAM=apt-ftparchive -MESSAGE="Must have db2 to build apt-ftparchive" +MESSAGE="Must have libdb to build apt-ftparchive" include $(FAIL_H) endif # ifdef BDBLIB diff --git a/ftparchive/override.cc b/ftparchive/override.cc index d363fd0fe..760c20120 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -12,13 +12,14 @@ // Include Files /*{{{*/ #include <config.h> -#include <apti18n.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <stdio.h> #include "override.h" + +#include <apti18n.h> /*}}}*/ // Override::ReadOverride - Read the override file /*{{{*/ diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index d02919969..3065526ad 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -318,7 +318,7 @@ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string c DoMD5 = _config->FindB("APT::FTPArchive::Packages::MD5",DoMD5); DoSHA1 = _config->FindB("APT::FTPArchive::Packages::SHA1",DoSHA1); DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA256",DoSHA256); - DoSHA256 = _config->FindB("APT::FTPArchive::Packages::SHA512",true); + DoSHA512 = _config->FindB("APT::FTPArchive::Packages::SHA512",DoSHA512); DoAlwaysStat = _config->FindB("APT::FTPArchive::AlwaysStat", false); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); @@ -948,6 +948,7 @@ ReleaseWriter::ReleaseWriter(string const &DB) AddPattern("Sources.lzma"); AddPattern("Sources.xz"); AddPattern("Release"); + AddPattern("Contents-*"); AddPattern("Index"); AddPattern("md5sum.txt"); } |