-
Committer:
Andrew Starr-Bochicchio
-
Date:
2010-06-18 18:48:58 UTC
-
mfrom:
(2.1.5 sid)
-
Revision ID:
a.starr.b@gmail.com-20100618184858-mmwkvgej1ce2clql
Tags: 0.6.28ubuntu1
* Merge from debian unstable. Remaining Ubuntu changes:
- minidinstall/version.py: set current version.
- debian/control: modify Suggests to ubuntu-keyring
- Change all occurrences of /usr/share/keyrings/debian-keyring.gpg to
/usr/share/keyrings/ubuntu-archive-keyring.gpg.