only in patch2: unchanged: --- sbuild-0.60.9.orig/debian/control +++ sbuild-0.60.9/debian/control @@ -1,7 +1,8 @@ Source: sbuild Section: devel Priority: extra -Maintainer: Debian buildd-tools Developers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian buildd-tools Developers Uploaders: Michael Banck , Roger Leigh , Francesco Paolo Lovergine Build-Depends: debhelper (>> 7.0.0) Standards-Version: 3.9.1 only in patch2: unchanged: --- sbuild-0.60.9.orig/debian/changelog +++ sbuild-0.60.9/debian/changelog @@ -1,3 +1,11 @@ +sbuild (0.60.9-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - bin/sbuild-createchroot: do not install debfoster into the chroots + because it is in universe and not needed for package building itself. + + -- Tarun Kumar Mall Sun, 20 Feb 2011 14:13:52 +0000 + sbuild (0.60.9-1) unstable; urgency=low * New release. @@ -47,6 +55,23 @@ -- Roger Leigh Mon, 14 Feb 2011 20:37:05 +0000 +sbuild (0.60.8-1ubuntu2) natty; urgency=low + + * lib/Sbuild/ResolverBase.pm: use -o APT::Install-Recommends=false + instead of --no-install-recommends as it is not a valid option in + Dapper schroots. This is Ubuntu-specific and can be removed once Dapper + goes EoL. + + -- Marc Deslauriers Wed, 12 Jan 2011 10:07:06 -0600 + +sbuild (0.60.8-1ubuntu1) natty; urgency=low + + * Merge from debian unstable, remaining changes: + - bin/sbuild-createchroot: do not install debfoster into the chroots + because it is in universe and not needed for package building itself. + + -- Lorenzo De Liso Tue, 04 Jan 2011 14:04:05 +0100 + sbuild (0.60.8-1) unstable; urgency=low * New release. @@ -107,6 +132,24 @@ -- Roger Leigh Tue, 07 Dec 2010 21:08:28 +0000 +sbuild (0.60.5-1ubuntu2) natty; urgency=low + + * lib/Sbuild/Build.pm: remove sysvinit from list of essential packages to + install when building Ubuntu packages. This would ideally be changed in + the 'build-essential' package for all Ubuntu releases which do not have + sysvinit, but this would require an SRU for each and would not allow for + building packages on EOL releases. (LP: #684931) + + -- Jamie Strandboge Fri, 03 Dec 2010 06:27:29 -0600 + +sbuild (0.60.5-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #680099). Remaining changes: + - bin/sbuild-createchroot: do not install debfoster into the chroots + because it is in universe and not needed for package building itself. + + -- Angel Abad Mon, 22 Nov 2010 16:28:20 +0100 + sbuild (0.60.5-1) unstable; urgency=low * Chroot upgrade and dist-upgrade commands run with @@ -115,6 +158,30 @@ -- Roger Leigh Sat, 13 Nov 2010 18:43:25 +0000 +sbuild (0.60.4-1ubuntu3) natty; urgency=low + + * Revert changes to lib/Sbuild/Build.pm from 0.60.4-1ubuntu2; this was + really a bug in build-essential, not in sbuild's handling of virtual + packages. + + -- Loïc Minier Sat, 13 Nov 2010 18:08:43 +0100 + +sbuild (0.60.4-1ubuntu2) natty; urgency=low + + * lib/Sbuild/Build.pm: read_build_essential(): skip "sysvinit" when parsing + /usr/share/doc/build-essential/essential-packages-list as sbuild can't + deal with virtual packages in this list; see Debian #602571. + + -- Loïc Minier Fri, 12 Nov 2010 17:26:25 +0100 + +sbuild (0.60.4-1ubuntu1) natty; urgency=low + + * Merge from Debian unstable, remaining changes: + - bin/sbuild-createchroot: do not install debfoster into the chroots + because it is in universe and not needed for package building itself. + + -- Loïc Minier Fri, 12 Nov 2010 02:55:46 +0100 + sbuild (0.60.4-1) unstable; urgency=low * New release. @@ -170,6 +237,17 @@ -- Roger Leigh Mon, 08 Nov 2010 17:07:40 +0000 +sbuild (0.60.2-1ubuntu1) natty; urgency=low + + * Merge from debian unstable, remaining changes: + - Do not install debfoster into the chroots because it is in universe + and not needed for package building itself. + * Dropped changes: + - buildd: Declare Replaces and Breaks on ubuntu-dev-tools (<= 0.83) as + both packages contain /usr/bin/buildd. (LP: #558461): fixed in debian + + -- Lorenzo De Liso Wed, 03 Nov 2010 14:53:31 +0100 + sbuild (0.60.2-1) unstable; urgency=low * New release. @@ -229,6 +307,19 @@ -- Roger Leigh Tue, 02 Nov 2010 13:02:50 +0000 +sbuild (0.60.1-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - Do not install debfoster into the chroots because it is in universe + and not needed for package building itself. + - buildd: Declare Replaces and Breaks on ubuntu-dev-tools (<= 0.83) as + both packages contain /usr/bin/buildd. (LP: #558461) + * Dropped change: (superceeded in debian) + - lib/Sbuild/Build.pm, Utility.pm: remove assumptions about filenames + in dsc (Closes: 559533). + + -- Bhavani Shankar Mon, 25 Oct 2010 11:34:30 +0530 + sbuild (0.60.1-1) unstable; urgency=low * New release. @@ -260,6 +351,43 @@ -- Roger Leigh Sun, 24 Oct 2010 19:56:34 +0100 +sbuild (0.60.0-2ubuntu1) maverick; urgency=low + + * Merge from debian unstable, remaining changes: + - Do not install debfoster into the chroots because it is in universe + and not needed for package building itself. + - buildd: Declare Replaces and Breaks on ubuntu-dev-tools (<= 0.83) as + both packages contain /usr/bin/buildd. (LP: #558461) + - lib/Sbuild/Build.pm, Utility.pm: remove assumptions about filenames + in dsc (Closes: 559533). + + -- Lorenzo De Liso Fri, 23 Jul 2010 22:12:51 +0200 + +sbuild (0.60.0-2) unstable; urgency=low + + * sbuild: + - disregard text after urgency field in the changelog, as further comments + are allowed by policy (Closes: #588550). + + -- Michael Banck Sun, 18 Jul 2010 14:48:43 +0200 + +sbuild (0.60.0-1ubuntu2) maverick; urgency=low + + * lib/Sbuild/Build.pm: remove assumptions about filenames in dsc + (Closes: 559533). + + -- Kees Cook Wed, 09 Jun 2010 16:30:27 -0700 + +sbuild (0.60.0-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable (LP: #580724), remaining changes: + - Do not install debfoster into the chroots because it is in universe + and not needed for package building itself. + * buildd: Declare Replaces and Breaks on ubuntu-dev-tools (<= 0.83) as + both packages contain /usr/bin/buildd. (LP: #558461) + + -- Felix Geyer Fri, 14 May 2010 23:13:17 +0200 + sbuild (0.60.0-1) unstable; urgency=low * debian/control: @@ -338,6 +466,23 @@ -- Roger Leigh Tue, 23 Feb 2010 22:24:52 +0000 +sbuild (0.59.0-1ubuntu2) lucid; urgency=low + + * lib/Sbuild.pm: correctly calculate free space, and not used space. Fix + backported from 0.60.0. + + -- Marc Deslauriers Thu, 22 Apr 2010 14:47:00 -0400 + +sbuild (0.59.0-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #408390 + - Do not install debfoster into the chroots because it is in universe + and not needed for package building itself. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Bhavani Shankar Mon, 03 Aug 2009 19:35:15 +0530 + sbuild (0.59.0-1) unstable; urgency=low [ Roger Leigh ] @@ -355,6 +500,13 @@ -- Roger Leigh Sun, 02 Aug 2009 11:15:26 +0100 +sbuild (0.58.6-1ubuntu1) karmic; urgency=low + + * Do not install debfoster into the chroots because it is in universe + and not needed for package building itself. + + -- Philipp Kern Tue, 30 Jun 2009 12:57:57 +0200 + sbuild (0.58.6-1) unstable; urgency=low [ Roger Leigh ] only in patch2: unchanged: --- sbuild-0.60.9.orig/bin/sbuild-createchroot +++ sbuild-0.60.9/bin/sbuild-createchroot @@ -157,8 +157,7 @@ # Make sure fakeroot and build-essential are installed $conf->set('INCLUDE', add_items($conf->get('INCLUDE'), "fakeroot", - "build-essential", - "debfoster")); + "build-essential")); my $suite = $ARGV[0]; # Create the target directory in advance so abs_path (which is buggy)