diff -Nru pbuilder-0.197/debian/changelog pbuilder-0.197ubuntu1/debian/changelog --- pbuilder-0.197/debian/changelog 2010-06-23 04:46:43.000000000 +0530 +++ pbuilder-0.197ubuntu1/debian/changelog 2010-06-24 12:28:56.000000000 +0530 @@ -1,3 +1,12 @@ +pbuilder (0.197ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: LP: #597980 + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com". + - pbuilderrc: Set default distribution to "maverick". + + -- Bhavani Shankar Thu, 24 Jun 2010 12:28:02 +0530 + pbuilder (0.197) unstable; urgency=low [ Loïc Minier ] @@ -47,6 +56,21 @@ -- Junichi Uekawa Wed, 23 Jun 2010 07:21:11 +0900 +pbuilder (0.196ubuntu2) maverick; urgency=low + + * Update the default dist to maverick. + + -- Loïc Minier Sat, 08 May 2010 13:54:39 +0200 + +pbuilder (0.196ubuntu1) lucid; urgency=low + + * Merge with Debian unstable (lp: #502135). Remaining changes: + - pbuilderrc, debian/pbuilder.config, debian/pbuilder.templates: Set + default archive mirror to "archive.ubuntu.com". + - pbuilderrc: Set default distribution to "lucid". + + -- Michael Bienia Sat, 02 Jan 2010 14:30:46 +0100 + pbuilder (0.196) unstable; urgency=low [ Loïc Minier ] @@ -131,6 +155,29 @@ -- Junichi Uekawa Sun, 29 Nov 2009 18:25:40 +0900 +pbuilder (0.192ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - 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 "lucid". + + 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). + + -- Michael Vogt Wed, 25 Nov 2009 11:37:25 +0100 + pbuilder (0.192) unstable; urgency=low * quote-escape debemail so that email with space can be handled @@ -154,6 +201,29 @@ -- Junichi Uekawa Tue, 25 Aug 2009 22:24:03 +0900 +pbuilder (0.189ubuntu1) karmic; urgency=low + + * 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). + + -- Bhavani Shankar Wed, 22 Jul 2009 13:42:01 +0530 + pbuilder (0.189) unstable; urgency=low [ Junichi Uekawa ] @@ -183,6 +253,34 @@ -- Junichi Uekawa Sun, 31 May 2009 10:44:05 +0900 +pbuilder (0.187ubuntu2) karmic; urgency=low + + * 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). + + -- Michael Bienia Sat, 06 Jun 2009 16:03:23 +0200 + +pbuilder (0.187ubuntu1) karmic; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - 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) + + -- Martin Pitt Mon, 04 May 2009 12:49:29 +0200 + pbuilder (0.187) unstable; urgency=low [ Junichi Uekawa ] @@ -244,6 +342,35 @@ -- Junichi Uekawa Thu, 27 Nov 2008 21:22:11 +0900 +pbuilder (0.183ubuntu1) jaunty; urgency=low + + * 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) + + -- Martin Pitt Wed, 05 Nov 2008 15:29:10 +0100 + pbuilder (0.183) unstable; urgency=low [ Junichi Uekawa ] @@ -284,6 +411,81 @@ -- Junichi Uekawa Tue, 12 Aug 2008 01:56:28 +0900 +pbuilder (0.181ubuntu7) intrepid; urgency=low + + * Demote cowdancer from Recommends to Suggests. This fits Suggests + semantics, and avoids pulling in qemu, bochs, gcc-3.4, and other stuff + into main. + + -- Martin Pitt Fri, 17 Oct 2008 10:20:45 +0200 + +pbuilder (0.181ubuntu6) intrepid; urgency=low + + * Fix: correctly handle multiple --debbuildopts (LP: #278213). + + -- TJ Sat, 4 Oct 2008 18:30:00 +0200 + +pbuilder (0.181ubuntu5) intrepid; urgency=low + + * Fix condition that makes build twice in a row the default behavior. + (LP: #258808) + + -- Nicolas Valcárcel Mon, 18 Aug 2008 00:54:57 -0500 + +pbuilder (0.181ubuntu4) intrepid; urgency=low + + [ Nicolas Valcárcel ] + * Make pbuilder lintian clean (LP: #254305): + - Edit debian/rules to not ignore make clean errors + - Modified Standars version + - Update debconf templates + - Modified doc-base Section to Debian according to new schema + - Added interpreter to pbuildd/hookdir/A10dpkg-l.sh due lintian error + * Added --twice build option (LP: #196008) + - Edited manpage with the new option + - Added option information on built-in help message + + [ Michael Vogt ] + * Added gdebi-core to Suggests (LP: #131153) + + -- Nicolas Valcárcel Sun, 03 Aug 2008 23:23:48 -0400 + +pbuilder (0.181ubuntu3) intrepid; urgency=low + + * Fix pbuilder-satisfydepends-gdebi: + gdebi needs to be called from outside the chroot as the .dsc file isn't + copied yet into the chroot (Closes: #472407, LP: #242449). + + -- Michael Bienia Mon, 23 Jun 2008 21:17:53 +0200 + +pbuilder (0.181ubuntu2) intrepid; urgency=low + + * debian/rules: s/ -a/ -s/ to fix FTBFS on powerpc (LP: #184218) + + -- Daniel Hahler Fri, 20 Jun 2008 11:01:15 +0100 + +pbuilder (0.181ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - Remove rootstrap build-dependency. + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "intrepid". + - Set Ubuntu components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + - pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) + * pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER + calls, so that "--buildresult" option gets passed to pbuilder + (LP: #129586) + * debian/pbuilder.config: + - add explaination header on new install that the new /etc/pbuilderrc + uses the default values from /usr/share/pbuilder/pbuilderrc + + -- Michael Vogt Thu, 29 May 2008 10:51:09 +0200 + pbuilder (0.181) unstable; urgency=low [ Esko Arajärvi ] @@ -381,6 +583,44 @@ -- Junichi Uekawa Wed, 26 Dec 2007 20:53:24 +0900 +pbuilder (0.176ubuntu2) hardy; urgency=low + + [ Daniel Hahler ] + * pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) + * pbuilder-satisfydepends-gdebi: add "--force-yes" to apt-get call + (LP: #123068) + * pdebuild: Move "$@" to end of "arg chain" for PDEBUILD_BUILDER + calls, so that "--buildresult" option gets passed to pbuilder + (LP: #129586) + + -- Michael Vogt Fri, 29 Feb 2008 12:49:35 +0100 + +pbuilder (0.176ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + - add missing po4a build-dep + * Makefile: + - Addded pbuilder-satisfydepends-gdebi + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "hardy". + - Set Ubuntu components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + * Support for specifying components is now included in Debian. + + -- Michael Vogt Thu, 29 Nov 2007 10:16:12 +0100 + pbuilder (0.176) unstable; urgency=low [ Loic Minier ] @@ -407,6 +647,38 @@ -- Junichi Uekawa Wed, 21 Nov 2007 19:22:00 +0900 +pbuilder (0.174ubuntu2) hardy; urgency=low + + * Fix sed for pdebuild-internal to stop matching Original-Maintainer + field as an output file name. + + -- John Dong Sat, 27 Oct 2007 15:30:13 -0400 + +pbuilder (0.174ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + * Makefile: + - Addded pbuilder-satisfydepends-gdebi + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "hardy". + - Set Ubuntu components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + * Support for specifying components is now included in Debian. + + -- Adrien Cunin Sat, 27 Oct 2007 13:58:41 +0200 + pbuilder (0.174) unstable; urgency=low [ Junichi Uekawa ] @@ -423,6 +695,34 @@ -- Junichi Uekawa Thu, 25 Oct 2007 20:18:09 +0900 +pbuilder (0.173ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + * Makefile: + - Addded pbuilder-satisfydepends-gdebi + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilder-modules: + - Add support for multiple components. + * pbuilderrc: + - Set default archive to "archive.ubuntu.com". + - Set default distribution to "gutsy". + - Add comment about components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilderrc.5: + - Document support for multiple components. + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + + -- Soren Hansen Fri, 19 Oct 2007 17:55:29 +0200 + pbuilder (0.173) unstable; urgency=low * documentation update: add svn-buildpackage example. + diff -Nru pbuilder-0.197/debian/control pbuilder-0.197ubuntu1/debian/control --- pbuilder-0.197/debian/control 2010-01-03 08:08:09.000000000 +0530 +++ pbuilder-0.197ubuntu1/debian/control 2010-06-23 18:55:29.000000000 +0530 @@ -1,7 +1,8 @@ Source: pbuilder Section: devel Priority: extra -Maintainer: Debian pbuilder maintenance team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian pbuilder maintenance team Uploaders: Junichi Uekawa , Loïc Minier , Matt Kraai diff -Nru pbuilder-0.197/debian/pbuilder.config pbuilder-0.197ubuntu1/debian/pbuilder.config --- pbuilder-0.197/debian/pbuilder.config 2008-11-26 05:19:55.000000000 +0530 +++ pbuilder-0.197ubuntu1/debian/pbuilder.config 2010-06-23 18:55:29.000000000 +0530 @@ -76,7 +76,7 @@ # if the interface is non-interactive, still set a valid mirror if [ $RETCODE = 30 ] ; then - MIRRORSITE="http://cdn.debian.net/debian" + MIRRORSITE="http://archive.ubuntu.com/ubuntu" else db_get pbuilder/mirrorsite MIRRORSITE="$RET" diff -Nru pbuilder-0.197/debian/pbuilder.templates pbuilder-0.197ubuntu1/debian/pbuilder.templates --- pbuilder-0.197/debian/pbuilder.templates 2008-03-15 07:50:30.000000000 +0530 +++ pbuilder-0.197ubuntu1/debian/pbuilder.templates 2010-06-23 18:55:29.000000000 +0530 @@ -1,6 +1,6 @@ Template: pbuilder/mirrorsite Type: string -Default: http://cdn.debian.net/debian +Default: http://archive.ubuntu.com/ubuntu _Description: Default mirror site: Please enter the default mirror you want to be used by pbuilder. . @@ -8,7 +8,7 @@ this information. If this attempt fails, you will be prompted again to insert some valid mirror information. . - Here is a valid mirror example: http://cdn.debian.net/debian + Here is a valid mirror example: http://archive.ubuntu.com/ubuntu Template: pbuilder/nomirror Type: error diff -Nru pbuilder-0.197/pbuilderrc pbuilder-0.197ubuntu1/pbuilderrc --- pbuilder-0.197/pbuilderrc 2010-01-31 09:22:57.000000000 +0530 +++ pbuilder-0.197ubuntu1/pbuilderrc 2010-06-23 18:55:28.000000000 +0530 @@ -5,7 +5,7 @@ #EXTRAPACKAGES="" #export DEBIAN_BUILDARCH=athlon BUILDPLACE=/var/cache/pbuilder/build/ -MIRRORSITE=http://cdn.debian.net/debian +MIRRORSITE=http://archive.ubuntu.com/ubuntu #OTHERMIRROR="deb http://www.home.com/updates/ ./" #export http_proxy=http://your-proxy:8080/ USEPROC=yes @@ -14,7 +14,7 @@ BUILDRESULT=/var/cache/pbuilder/result/ # specifying the distribution forces the distribution on "pbuilder update" -#DISTRIBUTION=sid +DISTRIBUTION=maverick # specifying the architecture passes --arch= to debootstrap; the default is # to use the architecture of the host #ARCHITECTURE=`dpkg --print-architecture`