-
Committer:
Bazaar Package Importer
-
Author(s):
Marc Deslauriers
-
Date:
2011-01-06 08:29:47 UTC
-
mfrom:
(1.2.9 sid)
-
Revision ID:
james.westby@ubuntu.com-20110106082947-b9989y6vpkywa4qb
Tags: 0.199+nmu1ubuntu1
* Merge from debian unstable. Remaining changes:
- pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set
default archive mirror to "archive.ubuntu.com/ubuntu".
- pbuilderrc: Set default distribution to "natty" and the default keyring
to the Ubuntu one.
- pbuilderrc: change how we pass keyring in DEBOOTSTRAPOPTS
- debian/rules: install temporary locale so man page tests don't cause
FTBFS.