* Merge with Debian unstable. Remaining Ubuntu changes: - debian/control: Prefer debootstrap over cdebootstrap. - debian/control: Demote cowdancer from Recommends to Suggests. This fits Suggests semantics. (Forwarded to Debian #504594) - debian/doc-base: Fix section. (Forwarded to Debian #504596) - pbuilderrc: + Set default archive to "archive.ubuntu.com". + Set default distribution to "jaunty". + Set Ubuntu components, but comment them out, so that it still defaults to "main". + Use debootstrap rather than cdebootstrap. + Use "sudo -E" for PBUILDERROOTCMD. (LP #175776, Debian #361362) - debian/pbuilder.config: add explanation header on new install that the new /etc/pbuilderrc uses the default values from /usr/share/pbuilder/pbuilderrc. (Forwarded to Debian #504599) - debian/pbuilder.templates, debian/pbuilder.config: Use Ubuntu mirror by default. - pbuilder-satisfydepends-checkparams, pbuilder-satisfydepends-gdebi: Fix 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)