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

Conflicts:
	apt-private/private-cmndline.cc

diff --combined apt-private/private-cmndline.cc
index f4348c9794267222aafd63407995c3efdf9efc3f,35d61f318ed2f0c3405b66de6cdfcb1b62532f78..28309af07304c515250d26ef32902023b5ab73f3
--- 1/apt-private/private-cmndline.cc
--- 2/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@@ -149,11 -149,7 +149,11 @@@ bool addArgumentsAPTGet(std::vector<Com
     else if (CmdMatches("build-dep"))
     {
        addArg('a', "host-architecture", "APT::Get::Host-Architecture", CommandLine::HasArg);
 +      addArg(0, "purge", "APT::Get::Purge", 0);
        addArg(0, "solver", "APT::Solver", CommandLine::HasArg);
 +      // this has no effect *but* sbuild is using it (see LP: #1255806)
 +      // once sbuild is fixed, this option can be removed
 +      addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);
     }
     else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") ||
            CmdMatches("markauto", "unmarkauto")) // deprecated commands
@@@ -226,8 -222,7 +226,8 @@@ bool addArgumentsAPT(std::vector<Comman
     {
        addArg(0,"installed","APT::Cmd::Installed",0);
        addArg(0,"upgradable","APT::Cmd::Upgradable",0);
-       addArg('a', "all-versions", "APT::Cmd::AllVersions", 0);
 +      addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
+       addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
     }
     else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
     {

diff --combined apt-private/private-list.cc
index 08851eb7e92978c00bc273e9eba9aa42b158c4bb,680a9a53515f38931a62d3e55c45d05f27b1b8b3..a02ebf02d091676e8d5c601a6b5cdc9133c9793c
--- 1/apt-private/private-list.cc
--- 2/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@@ -69,7 -69,7 +69,7 @@@ class PackageNameMatcher : public Match
              cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
  #else
           APT::CacheFilter::PackageMatcher *cachefilter = NULL;
-          if(_config->FindB("APT::Cmd::UseRegexp", false) == true)
+          if(_config->FindB("APT::Cmd::Use-Regexp", false) == true)
              cachefilter = new APT::CacheFilter::PackageNameMatchesRegEx(pattern);
           else
              cachefilter = new APT::CacheFilter::PackageNameMatchesFnmatch(pattern);
@@@ -132,8 -132,6 +132,8 @@@ bool List(CommandLine &Cmd
     std::map<std::string, std::string> output_map;
     std::map<std::string, std::string>::const_iterator K;
  
 +   bool includeSummary = _config->FindB("APT::Cmd::List-Include-Summary");
 +
     PackageNameMatcher matcher(patterns);
     LocalitySortedVersionSet bag;
     OpTextProgress progress;
@@@ -145,13 -143,13 +145,13 @@@
     for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); V++)
     {
        std::stringstream outs;
-       if(_config->FindB("APT::Cmd::AllVersions", false) == true)
+       if(_config->FindB("APT::Cmd::All-Versions", false) == true)
        {
           ListAllVersions(CacheFile, records, V.ParentPkg(), outs);
           output_map.insert(std::make_pair<std::string, std::string>(
              V.ParentPkg().Name(), outs.str()));
        } else {
 -         ListSingleVersion(CacheFile, records, V, outs, false);
 +         ListSingleVersion(CacheFile, records, V, outs, includeSummary);
           output_map.insert(std::make_pair<std::string, std::string>(
                             V.ParentPkg().Name(), outs.str()));
        }