-
Committer:
Bazaar Package Importer
-
Author(s):
Bhavani Shankar
-
Date:
2009-07-22 13:42:01 UTC
-
mfrom:
(1.1.5 sid)
-
Revision ID:
james.westby@ubuntu.com-20090722134201-s1u8rwiahiult1ht
Tags: 0.189ubuntu1
* Merge from debian unstable, remaining changes: LP: #402255
- debian/control, pbuilderrc: Prefer debootstrap over cdebootstrap.
- pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set
default archive mirror to "archive.ubuntu.com".
- pbuilderrc:
+ Set default distribution to "karmic".
+ Set Ubuntu components, but comment them out, so that it still defaults
to "main".
+ Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362)
- pbuilder-satisfydepends-gdebi: gdebi needs to be called from outside the
chroot as the .dsc file isn't copied yet into the chroot.
(Debian #472407, LP #242449).
- pbuilder-buildpackage, pbuilder.8, pbuilder-checkparams,
pbuilder-modules: Add support for building twice in a row.
(Debian #493538)
- pbuilder-satisfydepends-checkparams:
Re-add the CHROOT variable which got lost during the merge.
It's needed for pbuilder-satisfydepends-gdebi to work (lp: #384284).