Merge remote-tracking branch 'mvo/feature/short-list' into debian/sid

diff --combined apt-private/private-cmndline.cc
index 718a7ce6a82b8ce5c590aa899b07b3150b393dcc,b73227924a7f13db843289dc110cd2abcb85ef7a..f4348c9794267222aafd63407995c3efdf9efc3f
--- 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
@@@ -227,6 -223,7 +227,7 @@@ 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);
     }
     else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
     {