← Back to branch summary

~racb/ubuntu/quantal/apt/by_hash

« back to all changes in this revision

Viewing changes to cmdline/apt-cache.cc

  • Committer: Package Import Robot
  • Author(s): Steve Langasek, Michael Vogt, Steve Langasek
  • Date: 2012-06-11 22:36:16 UTC
  • mfrom: (1.4.47 sid)
  • Revision ID: package-import@ubuntu.com-20120611223616-1cctfc7qrxrx4vcu
Tags: 0.9.6ubuntu1
[ Michael Vogt ]
* merged from Debian, remaining changes:
  - use ubuntu keyring and ubuntu archive keyring in apt-key
  - run update-apt-xapian-index in apt.cron
  - support apt-key net-update and verify keys against master-keyring
  - run apt-key net-update in cron.daily
  - different example sources.list
  - APT::pkgPackageManager::MaxLoopCount set to 5000
  - apport pkgfailure handling
  - ubuntu changelog download handling
  - patch for apt cross-building, see http://bugs.debian.org/666772

[ Steve Langasek ]
* Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,
  removed in previous LTS.
* prepare-release: declare the packages needed as source build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmdline/apt-cache.cc
1676
1676
/* */
1677
1677
bool ShowHelp(CommandLine &Cmd)
1678
1678
{
1679
 
   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
 
1679
   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
1680
1680
            COMMON_ARCH,__DATE__,__TIME__);
1681
1681
   
1682
1682
   if (_config->FindB("version") == true)
1739
1739
      {'c',"config-file",0,CommandLine::ConfigFile},
1740
1740
      {'o',"option",0,CommandLine::ArbItem},
1741
1741
      {0,"installed","APT::Cache::Installed",0},
1742
 
      {0,"pre-depends","APT::Cache::ShowPreDepends",0},
 
1742
      {0,"pre-depends","APT::Cache::ShowPre-Depends",0},
1743
1743
      {0,"depends","APT::Cache::ShowDepends",0},
1744
1744
      {0,"recommends","APT::Cache::ShowRecommends",0},
1745
1745
      {0,"suggests","APT::Cache::ShowSuggests",0},