Merge branch 'debian/experimental' into feature/srv-records

Conflicts:
	cmdline/apt-helper.cc
	cmdline/makefile

diff --cc cmdline/apt-helper.cc
index aeeccf06d7a140563026c5ec34f2939cc7d5c2d6,a97fc903f35f33bf225621cbd6a22b0bd34dde7f..482e64dd15cff48980187cfcee2d8e33481ca866
--- 1/cmdline/apt-helper.cc
--- 2/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@@ -54,33 -81,9 +82,32 @@@ static bool DoDownloadFile(CommandLine 
     return true;
  }
  
 +static bool DoSrvLookup(CommandLine &CmdL)
 +{
 +   if (CmdL.FileSize() < 1)
 +      return _error->Error(_("Must specifc at least one srv record"));
 +   
 +   std::vector<SrvRec> srv_records;
 +   for(int i=1; CmdL.FileList[i] != NULL; i++)
 +   {
 +      if(GetSrvRecords(CmdL.FileList[i], srv_records) == false)
 +         _error->Warning(_("GetSrvRec failed for %s"), CmdL.FileList[i]);
 +      for (std::vector<SrvRec>::const_iterator I = srv_records.begin();
 +           I != srv_records.end(); ++I)
 +      {
 +         c1out << (*I).target.c_str() << " " 
 +               << (*I).priority << " " 
 +               << (*I).weight << " "
 +               << (*I).port << " "
 +               << std::endl;
 +      }
 +   }
 +   return true;
 +}
 +
  static bool ShowHelp(CommandLine &)
  {
-    ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-           COMMON_ARCH,__DATE__,__TIME__);
+    ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
  
     if (_config->FindB("version") == true)
       return true;
@@@ -103,7 -107,7 +131,8 @@@ int main(int argc,const char *argv[]
  {
     CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
                                   {"download-file", &DoDownloadFile},
 +                                 {"srv-lookup", &DoSrvLookup},
+                                  {"auto-detect-proxy", &DoAutoDetectProxy},
                                     {0,0}};
  
     std::vector<CommandLine::Args> Args = getCommandArgs(

diff --cc cmdline/makefile
index a24738e63115e92362dba8817fb0460ad1f535cc,816038c3b381045148fff4c0c814568a7768a0c0..6d21b08031ab34d5bc1d20ec29240adb741e791e
--- 1/cmdline/makefile
--- 2/cmdline/makefile
+++ b/cmdline/makefile
@@@ -49,8 -49,8 +49,8 @@@ include $(PROGRAM_H
  
  # The apt-helper
  PROGRAM=apt-helper
 -SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
 +SLIBS = -lapt-pkg -lapt-private $(INTLLIBS) -lresolv
- LIB_MAKES = apt-pkg/makefile
+ LIB_MAKES = apt-pkg/makefile apt-private/makefile
  SOURCE = apt-helper.cc
  include $(PROGRAM_H)