-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2011-06-29 09:03:39 UTC
-
mfrom:
(1.4.30 sid)
-
Revision ID:
james.westby@ubuntu.com-20110629090339-15jps4s07hl6kdsc
Tags: 0.8.15ubuntu1
* 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