~ksa618/ubuntu/oneiric/apt/fix-for-404724

Viewing all changes in revision 125.

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-10-29 10:07:09 UTC
  • mfrom: (1.4.13 sid)
  • Revision ID: james.westby@ubuntu.com-20101029100709-8jnm2zgcbrdcd5o6
Tags: 0.8.8ubuntu1
* merged from debian-unstable, remainging 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: