Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 1b636e4d5fe6c6851a7cc5f718cdb07e455bc30f..aef7636e9b8eb775bb55053448c9a6a472ea4bb5 100644 (file)
--- 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,33 +20,30 @@
 #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 <<
-               _("Usage: apt-internal-resolver\n"
+               _("Usage: apt-internal-solver\n"
                "\n"
-               "apt-internal-resolver is an interface to use the current internal\n"
+               "apt-internal-solver is an interface to use the current internal\n"
                "like an external resolver for the APT family for debugging or alike\n"
                "\n"
                "Options:\n"
                "  -h  This help text.\n"
                "  -q  Loggable output - no progress indicator\n"
                "  -c=? Read this configuration file\n"
-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-               "apt.conf(5) manual pages for more information and options.\n"
-               "                       This APT has Super Cow Powers.\n");
+               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
        return true;
 }
                                                                        /*}}}*/