From 7f10ea3aee46a2252153a2fba118a12b8af1c763 Mon Sep 17 00:00:00 2001 From: codehelp Date: Mon, 26 Jul 2010 21:54:02 +0000 Subject: [PATCH] Add aptitude to crosschroot configs as pbuilder now requires it. git-svn-id: http://emdebian.org/svn/current@7345 563faec7-e20c-0410-992a-a66f704d0ccd --- cross/crosschroot-stable.conf | 2 +- cross/crosschroot-testing.conf | 2 +- cross/crosschroot.conf | 2 +- debian/changelog | 3 ++- multistrap | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index eb4d565..de65f0d 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -23,7 +23,7 @@ aptsources=Base # Lenny toolchains need -base from Lenny. [Base] -packages=gcc-4.2-base dpkg-dev binutils-multiarch +packages=gcc-4.2-base dpkg-dev binutils-multiarch build-essential aptitude source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf index d750328..58a07cd 100644 --- a/cross/crosschroot-testing.conf +++ b/cross/crosschroot-testing.conf @@ -31,7 +31,7 @@ omitdebsrc=false # this is a duplicate if the suite is the same as the toolchain. [Debian] -packages=dpkg-dev binutils-multiarch +packages=dpkg-dev binutils-multiarch build-essential aptitude source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=testing diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf index fbb28eb..ceb2370 100644 --- a/cross/crosschroot.conf +++ b/cross/crosschroot.conf @@ -31,7 +31,7 @@ omitdebsrc=false # this is a duplicate if the suite is the same as the toolchain. [Debian] -packages=dpkg-dev binutils-multiarch build-essential dpkg-cross +packages=dpkg-dev binutils-multiarch build-essential dpkg-cross aptitude source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=unstable diff --git a/debian/changelog b/debian/changelog index 1a919ed..0c21373 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ multistrap (2.1.6) unstable; urgency=low * Avoid unitialised Priority value. * Call dpkg --print-architecture for determination of host architecture. (Closes: #589713) + * Add aptitude to crosschroot configs as pbuilder now requires it. - -- Neil Williams Tue, 20 Jul 2010 10:59:20 +0100 + -- Neil Williams Mon, 26 Jul 2010 22:53:39 +0100 multistrap (2.1.5) unstable; urgency=low diff --git a/multistrap b/multistrap index d25a614..bc656c8 100755 --- a/multistrap +++ b/multistrap @@ -689,7 +689,7 @@ sub get_required_debs { while (my %package = $parser->next) { if (not defined $package{'Priority'} and (defined $package{'Essential'})) { $required{$package{'Package'}}++; - continue; + next; } next if (not defined $package{'Priority'}); next unless $package{'Priority'} eq "required";