josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add aptitude to crosschroot configs as pbuilder now requires it.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7345 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-07-26 21:54:02 +00:00
parent 4b8e8cb592
commit 7f10ea3aee
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cross/crosschroot-stable.conf
View file

@ -23,7 +23,7 @@ aptsources=Base
# Lenny toolchains need -base from Lenny. # Lenny toolchains need -base from Lenny.
[Base] [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 source=http://ftp.uk.debian.org/debian
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=stable suite=stable

2
cross/crosschroot-testing.conf
View file

@ -31,7 +31,7 @@ omitdebsrc=false
# this is a duplicate if the suite is the same as the toolchain. # this is a duplicate if the suite is the same as the toolchain.
[Debian] [Debian]
packages=dpkg-dev binutils-multiarch packages=dpkg-dev binutils-multiarch build-essential aptitude
source=http://ftp.uk.debian.org/debian source=http://ftp.uk.debian.org/debian
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=testing suite=testing

2
cross/crosschroot.conf
View file

@ -31,7 +31,7 @@ omitdebsrc=false
# this is a duplicate if the suite is the same as the toolchain. # this is a duplicate if the suite is the same as the toolchain.
[Debian] [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 source=http://ftp.uk.debian.org/debian
keyring=debian-archive-keyring keyring=debian-archive-keyring
suite=unstable suite=unstable

3
debian/changelog vendored
View file

@ -5,8 +5,9 @@ multistrap (2.1.6) unstable; urgency=low
* Avoid unitialised Priority value. * Avoid unitialised Priority value.
* Call dpkg --print-architecture for determination of host * Call dpkg --print-architecture for determination of host
architecture. (Closes: #589713) 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 (2.1.5) unstable; urgency=low

2
multistrap
View file

@ -689,7 +689,7 @@ sub get_required_debs {
while (my %package = $parser->next) { while (my %package = $parser->next) {
if (not defined $package{'Priority'} and (defined $package{'Essential'})) { if (not defined $package{'Priority'} and (defined $package{'Essential'})) {
$required{$package{'Package'}}++; $required{$package{'Package'}}++;
continue; next;
} }
next if (not defined $package{'Priority'}); next if (not defined $package{'Priority'});
next unless $package{'Priority'} eq "required"; next unless $package{'Priority'} eq "required";