Merge remote-tracking branch 'mvo/feature/apt-show-nice' into debian/experimental...

Conflicts:
	apt-private/private-cmndline.cc

diff --cc apt-private/private-cmndline.cc
index d6d7bca64be8ebedc56effc33e850d4e3ab0e46c,2b6c710d6c4c85f909a5671c7b881cf0a12e08a0..ef7d65f3c59de7fec88efe2943fa94ccd873e417
--- 1/apt-private/private-cmndline.cc
--- 2/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@@ -230,6 -230,15 +230,10 @@@ bool addArgumentsAPT(std::vector<Comman
        addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
        addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
     }
 -   else if (CmdMatches("upgrade"))
 -   {
 -      // FIXME: find a better term
 -      addArg(0,"dist","APT::Cmd::Dist-Upgrade", CommandLine::Boolean);
 -   }
+    else if (CmdMatches("show"))
+    {
+       addArg('a', "all-versions", "APT::Cache::AllVersions", 0);
+    }
     else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
     {
         // we have no (supported) command-name overlaps so far, so we call