diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-22 16:07:49 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-22 16:07:49 +0200 |
| commit | 800694cbf33e206935dc9e6e8fa6e9a036b8efad (patch) | |
| tree | 1557d96ee0f463a020b11604146be66fb9809a31 /cmdline/apt-internal-solver.cc | |
| parent | 6c0c0387e616f8d04f00916fbd1fe899acd265cd (diff) | |
| parent | 1351329e376a8dbe7780693693d0f3db0ec749fa (diff) | |
merged (and resolved a bunch of conflicts) of the debian-sid branch
Diffstat (limited to 'cmdline/apt-internal-solver.cc')
| -rw-r--r-- | cmdline/apt-internal-solver.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 1b636e4d5..e7faf88a9 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -7,6 +7,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <config.h> + #include <apt-pkg/error.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/init.h> @@ -18,18 +20,17 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/pkgsystem.h> -#include <config.h> -#include <apti18n.h> - #include <unistd.h> #include <cstdio> + +#include <apti18n.h> /*}}}*/ // ShowHelp - Show a help screen /*{{{*/ // --------------------------------------------------------------------- /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION, COMMON_ARCH,__DATE__,__TIME__); std::cout << |