-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2011-05-03 12:20:24 UTC
-
mfrom:
(1.2.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20110503122024-m68p7dlyp9t7a7p0
Tags: 0.199+nmu3ubuntu1
* Merge from debian unstable (LP: #776279), remaining changes:
- pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set
default archive mirror to "archive.ubuntu.com/ubuntu".
- pbuilderrc: Set default distribution to "oneiric" 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.