← Back to branch summary

~ubuntu-branches/ubuntu/quantal/apt/quantal

« back to all changes in this revision

Viewing changes to ftparchive/apt-ftparchive.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:
ftparchive/apt-ftparchive.cc
451
451
   string DIPrfx = Setup.Find("TreeDefault::InternalPrefix",
452
452
                            "$(DIST)/$(SECTION)/");
453
453
   string DContents = Setup.Find("TreeDefault::Contents",
454
 
                            "$(DIST)/Contents-$(ARCH)");
 
454
                            "$(DIST)/$(SECTION)/Contents-$(ARCH)");
455
455
   string DContentsH = Setup.Find("TreeDefault::Contents::Header","");
456
456
   string DBCache = Setup.Find("TreeDefault::BinCacheDB",
457
457
                               "packages-$(ARCH).db");
587
587
/* */
588
588
bool ShowHelp(CommandLine &CmdL)
589
589
{
590
 
   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
 
590
   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
591
591
            COMMON_ARCH,__DATE__,__TIME__);
592
592
   if (_config->FindB("version") == true)
593
593
      return true;