X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ebfeeaedf5bc357170cae971c0f6a1458ff65f65..3bbce699ee1a5dbbe37806aee7afcc615ecc6ebe:/cmdline/apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index ad00a0e23..aef7636e9 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -7,42 +7,43 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
+#include <config.h>
+
 #include <apt-pkg/error.h>
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/cachefile.h>
+#include <apt-pkg/cacheset.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/edsp.h>
 #include <apt-pkg/algorithms.h>
 #include <apt-pkg/fileutl.h>
-
-#include <config.h>
-#include <apti18n.h>
+#include <apt-pkg/pkgsystem.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;
 }
 									/*}}}*/
@@ -97,7 +98,7 @@ int main(int argc,const char *argv[])					/*{{{*/
 	if (_config->FindI("quiet", 0) < 1)
 		_config->Set("Debug::EDSP::WriteSolution", true);
 
-	_config->Set("APT::Solver::Name", "internal");
+	_config->Set("APT::Solver", "internal");
 	_config->Set("edsp::scenario", "stdin");
 	int input = STDIN_FILENO;
 	FILE* output = stdout;