diff -Nru pbuilder-0.177/debian/changelog pbuilder-0.177ubuntu1/debian/changelog --- pbuilder-0.177/debian/changelog 2007-12-26 12:54:38.000000000 +0100 +++ pbuilder-0.177ubuntu1/debian/changelog 2008-01-31 02:20:46.000000000 +0100 @@ -1,3 +1,27 @@ +pbuilder (0.177ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + - Remove rootstrap build-dependency. + - add missing po4a build-dep + * 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. + * pbuilderrc: use "sudo -E" for PBUILDERROOTCMD (LP: #175776) + * debian/control: Recommend gdebi-core for pbuilder (LP: #131153) + * 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) + + -- Daniel Hahler Thu, 31 Jan 2008 02:20:33 +0100 + pbuilder (0.177) unstable; urgency=low [ Loic Minier ] @@ -11,6 +35,32 @@ -- Junichi Uekawa Wed, 26 Dec 2007 20:53:24 +0900 +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 ] @@ -37,6 +87,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 ] @@ -53,6 +135,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. @@ -87,6 +197,34 @@ -- Junichi Uekawa Wed, 01 Aug 2007 21:19:09 +0900 +pbuilder (0.170ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilderrc: + - Set default distribution to "gutsy". + - Set default archive to "archive.ubuntu.com". + - Add comment about components. + - Don't create a buildd variant by default. + - Use debootstrap rather than cdebootstrap. + * pbuilder-modules: + - Add support for multiple components. + * pbuilderrc.5: + - Document support for multiple components. + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + * Remove pbuilder-uml build-dependency. UML is not in main, and it's only + really needed to run the testsuite, which doesn't get run automatically + anyway. + + -- Soren Hansen Tue, 10 Jul 2007 14:14:02 +0200 + pbuilder (0.170) unstable; urgency=low * add example rebuild script from Bastian Venthur @@ -106,6 +244,27 @@ -- Junichi Uekawa Mon, 25 Jun 2007 21:26:25 +0900 +pbuilder (0.169ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit. + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends (needed for + pbuilder-satisfydepends-gdebi) + * pbuilderrc: + - Set default distribution to "gutsy". + * pbuilder-modules: + - Add support for multiple components. + * pbuilderrc.5: + - Document support for multiple components. + * debian/control: + - Prefer debootstrap over cdebootstrap. + - DebianMaintainerField. + + -- Soren Hansen Mon, 11 Jun 2007 16:55:29 +0200 + pbuilder (0.169) unstable; urgency=low [ Loic Minier ] @@ -170,6 +329,18 @@ -- Junichi Uekawa Sun, 27 May 2007 15:53:49 +0900 +pbuilder (0.166ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends + * Defaults to gutsy in pbuilderrc + + -- Stephan Hermann Sat, 12 May 2007 20:31:01 +0200 + pbuilder (0.166) unstable; urgency=low [ Junichi Uekawa ] @@ -244,6 +415,23 @@ -- Junichi Uekawa Tue, 26 Dec 2006 17:11:08 +0900 +pbuilder (0.161ubuntu2) feisty; urgency=low + + * pbuilder-satisfydepends-gdebi: + - added alternative b-d resolver that should should speed up b-d + resolution quite a bit + * pbuilder-buildpackage-funcs: + - always pass --chroot to the pbuilder-satisfydepends + + -- Michael Vogt Thu, 1 Mar 2007 13:34:09 +0100 + +pbuilder (0.161ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + * Default to feisty in pbuilderrc + + -- Michael Vogt Wed, 22 Nov 2006 09:23:43 +0100 + pbuilder (0.161) unstable; urgency=low [ Junichi Uekawa ] @@ -323,6 +511,25 @@ -- Junichi Uekawa Wed, 26 Jul 2006 08:38:56 +0900 +pbuilder (0.155ubuntu3) edgy; urgency=low + + * added the COMPONENTS option to the man-page (thanks to Sami Haahtinen) + + -- Michael Vogt Mon, 28 Aug 2006 11:45:55 +0200 + +pbuilder (0.155ubuntu2) edgy; urgency=low + + * Default to edgy + + -- Matt Zimmerman Wed, 12 Jul 2006 11:13:08 -0700 + +pbuilder (0.155ubuntu1) edgy; urgency=low + + * merged debian changes + * remove all 'CVS' control files + + -- Reinhard Tartler Sat, 17 Jun 2006 12:29:22 +0200 + pbuilder (0.155) unstable; urgency=low [Junichi Uekawa] @@ -431,6 +638,43 @@ -- Junichi Uekawa Mon, 30 Jan 2006 23:09:41 +0900 +pbuilder (0.145ubuntu4.1) dapper-updates; urgency=low + + * Changing the order of cdebootstrap | debootstrap dependencies, + (Closes: Malone #40613 + duplicates) + + -- Reinhard Tartler Sat, 17 Jun 2006 12:14:49 +0200 + +pbuilder (0.145ubuntu4) dapper; urgency=low + + * pbuilder-modules: deleted extra space in a variable assignment expression + which prevents pbuilder to create a dapper chroot. + (Closes: Malone #38456) + + -- Loic Pefferkorn Thu, 6 Apr 2006 17:44:04 +0000 + +pbuilder (0.145ubuntu3) dapper; urgency=low + + * add support for multiple components (thanks to Sami Haahtinen) + (ubuntu: #29956) + * removed pbuilder-uml from suggests (not available in ubuntu) + (ubuntu: #20971) + + -- Michael Vogt Tue, 4 Apr 2006 11:35:42 +0200 + +pbuilder (0.145ubuntu2) dapper; urgency=low + + * pbuilderrc: make the config work out-of-the-box on dapper (#19659) + + -- Michael Vogt Mon, 3 Apr 2006 16:36:12 +0200 + +pbuilder (0.145ubuntu1) dapper; urgency=low + + * resync with debian. Did cleanups to debian/changelog, and removed + weird cruft from the previous merge + + -- Reinhard Tartler Sat, 14 Jan 2006 12:08:04 +0100 + pbuilder (0.145) unstable; urgency=low [Junichi Uekawa] @@ -501,6 +745,13 @@ -- Junichi Uekawa Sun, 4 Dec 2005 15:21:06 +0900 +pbuilder (0.139ubuntu1) dapper; urgency=low + + * Resynchronise with Debian, merged by hand, the MoM result + looked a bit odd. + + -- Michael Vogt Thu, 24 Nov 2005 12:06:01 +0100 + pbuilder (0.139) unstable; urgency=low [Junichi Uekawa] @@ -518,6 +769,12 @@ -- Junichi Uekawa Fri, 11 Nov 2005 08:46:38 +0900 +pbuilder (0.137ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Tollef Fog Heen Wed, 9 Nov 2005 10:53:40 +0100 + pbuilder (0.137) unstable; urgency=low [Junichi Uekawa] @@ -540,6 +797,13 @@ -- Junichi Uekawa Thu, 3 Nov 2005 10:06:58 +0900 +pbuilder (0.136ubuntu1) dapper; urgency=low + + * Default to debootstrap rather than cdebootstrap; cdebootstrap doesn't + work with Ubuntu yet. + + -- Colin Watson Sun, 30 Oct 2005 04:43:41 +0000 + pbuilder (0.136) unstable; urgency=low [Junichi Uekawa] @@ -2012,3 +2276,4 @@ * Initial Release. -- Junichi Uekawa Mon, 27 Aug 2001 18:50:06 +0900 + diff -Nru /tmp/vRKhpRIUAe/pbuilder-0.177/debian/control /tmp/KC14x_GXj6/pbuilder-0.177ubuntu1/debian/control --- pbuilder-0.177/debian/control 2007-10-30 01:18:43.000000000 +0100 +++ pbuilder-0.177ubuntu1/debian/control 2008-01-30 23:42:42.000000000 +0100 @@ -1,17 +1,18 @@ Source: pbuilder Section: devel Priority: extra -Maintainer: Debian pbuilder maintenance team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian pbuilder maintenance team Uploaders: Junichi Uekawa , Matt Kraai -Build-Depends: debhelper (>= 4.1.0), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, rootstrap [i386 amd64] +Build-Depends: debhelper (>= 4.1.0), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, po4a Standards-Version: 3.7.2 Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git Package: pbuilder Architecture: all -Depends: cdebootstrap|debootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1) -Recommends: fakeroot, sudo, devscripts, cowdancer +Depends: debootstrap|cdebootstrap, wget, gcc, debianutils (>= 1.13.1), coreutils (>= 4.5.8-1) +Recommends: fakeroot, sudo, devscripts, cowdancer, gdebi-core Suggests: pbuilder-uml Description: personal package builder for Debian packages pbuilder constructs a chroot system, and builds a package inside the diff -Nru /tmp/vRKhpRIUAe/pbuilder-0.177/pbuilderrc /tmp/KC14x_GXj6/pbuilder-0.177ubuntu1/pbuilderrc --- pbuilder-0.177/pbuilderrc 2007-10-25 01:22:11.000000000 +0200 +++ pbuilder-0.177ubuntu1/pbuilderrc 2008-01-30 23:12:46.000000000 +0100 @@ -8,7 +8,7 @@ #EXTRAPACKAGES=gcc3.0-athlon-builder #export DEBIAN_BUILDARCH=athlon BUILDPLACE=/var/cache/pbuilder/build/ -MIRRORSITE=http://ftp.jp.debian.org/debian +MIRRORSITE=http://archive.ubuntu.com/ubuntu #OTHERMIRROR="deb http://www.home.com/updates/ ./" #export http_proxy=http://your-proxy:8080/ USEPROC=yes @@ -17,9 +17,9 @@ BUILDRESULT=/var/cache/pbuilder/result/ # specifying the distribution forces the distribution on "pbuilder update" -#DISTRIBUTION=lenny -# specifying the components of the distribution -COMPONENTS="main" +DISTRIBUTION=hardy +# specifying the components of the distribution (default is "main") +#COMPONENTS="main restricted universe multiverse" #specify the cache for APT APTCACHE="/var/cache/pbuilder/aptcache/" APTCACHEHARDLINK="yes" @@ -32,9 +32,9 @@ DEBEMAIL="" -#for pbuilder debuild +# for pbuilder debuild (sudo -E keeps the environment as-is) BUILDSOURCEROOTCMD="fakeroot" -PBUILDERROOTCMD="sudo" +PBUILDERROOTCMD="sudo -E" # command to satisfy build-dependencies; the default is an internal shell # implementation which is relatively slow; there are two alternate @@ -62,9 +62,9 @@ BINDMOUNTS="" # Set the debootstrap variant to 'buildd' type. -DEBOOTSTRAPOPTS[0]='--variant=buildd' -# or unset it to make it not a buildd type. -# unset DEBOOTSTRAPOPTS +# DEBOOTSTRAPOPTS[0]='--variant=buildd' +# or work around bug in debootstrap 3.0.0 (314858) +unset DEBOOTSTRAPOPTS # Set the PATH I am going to use inside pbuilder: default is "/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin" export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin" @@ -73,7 +73,7 @@ export SHELL=/bin/bash # The name of debootstrap command. -DEBOOTSTRAP="cdebootstrap" +DEBOOTSTRAP="debootstrap" # default file extension for pkgname-logfile PKGNAME_LOGFILE_EXTENTION="_$(dpkg --print-architecture).build" diff -Nru /tmp/vRKhpRIUAe/pbuilder-0.177/pbuilder-satisfydepends-gdebi /tmp/KC14x_GXj6/pbuilder-0.177ubuntu1/pbuilder-satisfydepends-gdebi --- pbuilder-0.177/pbuilder-satisfydepends-gdebi 2007-12-26 11:56:44.000000000 +0100 +++ pbuilder-0.177ubuntu1/pbuilder-satisfydepends-gdebi 2008-01-30 23:51:39.000000000 +0100 @@ -77,4 +77,4 @@ done INSTALL=$(/usr/bin/gdebi --quiet --apt-line --root $CHROOT $DEBIAN_CONTROL) -$CHROOTEXEC /usr/bin/apt-get install -y $INSTALL \ Kein Zeilenumbruch am Dateiende. +$CHROOTEXEC /usr/bin/apt-get install -y --force-yes $INSTALL diff -Nru /tmp/vRKhpRIUAe/pbuilder-0.177/pdebuild /tmp/KC14x_GXj6/pbuilder-0.177ubuntu1/pdebuild --- pbuilder-0.177/pdebuild 2007-11-01 01:41:32.000000000 +0100 +++ pbuilder-0.177ubuntu1/pdebuild 2008-01-31 01:50:34.000000000 +0100 @@ -45,7 +45,7 @@ export BUILDRESULTGID=$(id -g) if [ "${USE_PDEBUILD_INTERNAL}" = 'yes' ]; then - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD" + ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --execute ${EXTRA_CONFIGFILE[@]/#/--configfile } --bindmounts $(readlink -f ..) "$@" -- /usr/lib/pbuilder/pdebuild-internal ${PWD} --debbuildopts "${DEBBUILDOPTS}" --uid "${BUILDRESULTUID}" --gid "${BUILDRESULTGID}" --pbuildersatisfydepends "$PBUILDERSATISFYDEPENDSCMD" if [ -d "${BUILDRESULT}" ]; then for files in $(sed -rn '/^Files:/,${s/^ .* ([^ ]+)$/\1/p}' ../${CHANGES}); do cp -a ../"$files" "${BUILDRESULT}" @@ -60,7 +60,7 @@ echo "W: Unmet build-dependency in source" >&2 fi echo "dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} $DEBBUILDOPTS" | perl -pe 's/(^|\s)-[bB](\s|$)/$1$2/g' | /bin/bash - ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build "$@" ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc + ${PBUILDERROOTCMD} ${PDEBUILD_PBUILDER} --build ${EXTRA_CONFIGFILE[@]/#/--configfile } --buildresult "${BUILDRESULT}" --debbuildopts "${DEBBUILDOPTS}" "$@" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc fi # do signing with optional key specifier