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

@@ -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

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

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

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 <codehelp@debian.org>  Tue, 20 Jul 2010 10:59:20 +0100
+ -- Neil Williams <codehelp@debian.org>  Mon, 26 Jul 2010 22:53:39 +0100
 
 multistrap (2.1.5) unstable; urgency=low
 

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";