merged from the debian-sid branch

diff --combined cmdline/apt-get.cc
index c8804f74d2e4a7695b5f87ef0221fa660918f861,a7221d47dd576c6568da3a89c40674f3d39f517a..ea7d459525deabde7e0bcab33cd31a409d16b01f
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1295,9 -1295,9 +1295,9 @@@ pkgSrcRecords::Parser *FindSrc(const ch
     {
        string Ver = Parse->Version();
        
 -      // Skip name mismatches
 -      if (IsMatch == true && Parse->Package() != Src)
 -       continue;
 +      // show name mismatches
 +      if (IsMatch == true && Parse->Package() != Src) 
 +       ioprintf(c1out,  _("No source package '%s' picking '%s' instead"), Parse->Package(), Src);
        
        if (VerTag.empty() == false)
        {
@@@ -2097,33 -2097,6 +2097,33 @@@ bool DoSource(CommandLine &CmdL
        if (Last == 0)
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
        
 +      string srec = Last->AsStr();
 +      string::size_type pos = srec.find("\nVcs-");
 +      while (pos != string::npos)
 +      {
 +       pos += strlen("\nVcs-");
 +       string vcs = srec.substr(pos,srec.find(":",pos)-pos);
 +       if(vcs == "Browser") 
 +       {
 +          pos = srec.find("\nVcs-", pos);
 +          continue;
 +       }
 +       pos += vcs.length()+2;
 +       string::size_type epos = srec.find("\n", pos);
 +       string uri = srec.substr(pos,epos-pos).c_str();
 +       ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in "
 +                         "the '%s' version control system at:\n"
 +                         "%s\n"),
 +                Src.c_str(), vcs.c_str(), uri.c_str());
 +       if(vcs == "Bzr") 
 +          ioprintf(c1out,_("Please use:\n"
 +                           "bzr get %s\n"
 +                           "to retrieve the latest (possible unreleased) "
 +                           "updates to the package.\n"),
 +                   uri.c_str());
 +       break;
 +      }
 +
        // Back track
        vector<pkgSrcRecords::File> Lst;
        if (Last->Files(Lst) == false)
@@@ -2542,7 -2515,7 +2542,7 @@@ bool DoBuildDep(CommandLine &CmdL
              {
                 // We successfully installed something; skip remaining alternatives
                 skipAlternatives = hasAlternatives;
 -             if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true)
 +             if(_config->FindB("APT::Get::Build-Dep-Automatic", true) == true)
                  Cache->MarkAuto(Pkg, true);
                 continue;
              }
@@@ -2759,7 -2732,6 +2759,6 @@@ int main(int argc,const char *argv[]
        {0,"only-source","APT::Get::Only-Source",0},
        {0,"arch-only","APT::Get::Arch-Only",0},
        {0,"auto-remove","APT::Get::AutomaticRemove",0},
-       {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0},
        {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0},
        {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
        {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},