From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 18:45:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'mvo/feature/short-list' into debian/sid
X-Git-Tag: 0.9.13.1.ubuntu1~1^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/83ef59c23699ed3cd3dc9d6d907a0d0359ab2fee?ds=inline;hp=-c

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

83ef59c23699ed3cd3dc9d6d907a0d0359ab2fee
diff --combined apt-private/private-cmndline.cc
index 718a7ce6a,b73227924..f4348c979
--- a/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))
     {