diff options
| author | Peter Karlsson <peterk@debian.org> | 2007-10-08 11:44:54 +0100 |
|---|---|---|
| committer | Peter Karlsson <peterk@debian.org> | 2007-10-08 11:44:54 +0100 |
| commit | 21231056c2f4fb82730c0ac7e7f90456668cae38 (patch) | |
| tree | 1f9ca6a27065dce5014adea7095596ec6a8cb744 /ftparchive | |
| parent | 28b68bf4207be80d4549579f34262f1248a2e528 (diff) | |
| parent | 24401c09f0a826ec0074f46dfe70efe3aaf79f25 (diff) | |
Merge upstream.
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/apt-ftparchive.cc | 4 | ||||
| -rw-r--r-- | ftparchive/writer.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 290326ec3..3b1e80631 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -544,8 +544,8 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 59107e02b..9d248ab86 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -28,6 +28,7 @@ #include <ftw.h> #include <fnmatch.h> #include <iostream> +#include <memory> #include "cachedb.h" #include "apt-ftparchive.h" |