Re-expand a couple of dpkg architecture wildcards to exclude certain

special cases: gcc-4.4-multilib is not available on kfreebsd-i386 or
hurd-i386, and qemu-system is not available on hurd-i386.
This commit is contained in:
Colin Watson 2010-11-23 10:32:29 +00:00
parent 18a2a24a43
commit 32c45a3bfd
2 changed files with 5 additions and 2 deletions

3
debian/changelog vendored
View File

@ -8,6 +8,9 @@ grub2 (1.99~20101122-2) UNRELEASED; urgency=low
* Upgrade the installed core image when upgrading grub-efi-ia32 or * Upgrade the installed core image when upgrading grub-efi-ia32 or
grub-efi-amd64, although only if /boot/efi/EFI/<id> (where <id> is an grub-efi-amd64, although only if /boot/efi/EFI/<id> (where <id> is an
identifier based on GRUB_DISTRIBUTOR, e.g. 'debian') already exists. identifier based on GRUB_DISTRIBUTOR, e.g. 'debian') already exists.
* Re-expand a couple of dpkg architecture wildcards to exclude certain
special cases: gcc-4.4-multilib is not available on kfreebsd-i386 or
hurd-i386, and qemu-system is not available on hurd-i386.
-- Colin Watson <cjwatson@debian.org> Mon, 22 Nov 2010 15:44:40 +0000 -- Colin Watson <cjwatson@debian.org> Mon, 22 Nov 2010 15:44:40 +0000

4
debian/control vendored
View File

@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7.0.50~),
po-debconf, po-debconf,
help2man, help2man,
texinfo, texinfo,
gcc-4.4-multilib [any-i386 any-amd64 any-sparc], gcc-4.4-multilib [i386 kopensolaris-i386 any-amd64 any-sparc],
gcc-4.4, gcc-4.4,
libncurses5-dev, libncurses5-dev,
xfonts-unifont, xfonts-unifont,
@ -28,7 +28,7 @@ Build-Depends: debhelper (>= 7.0.50~),
libnvpair-dev [kfreebsd-any], libnvpair-dev [kfreebsd-any],
libsdl1.2-dev [!hurd-any], libsdl1.2-dev [!hurd-any],
xorriso (>= 0.5.6.pl00), xorriso (>= 0.5.6.pl00),
qemu-system [any-i386 any-amd64], qemu-system [i386 kfreebsd-i386 kopensolaris-i386 any-amd64],
qemu-utils [!hurd-any], qemu-utils [!hurd-any],
parted [!hurd-any], parted [!hurd-any],
Build-Conflicts: autoconf2.13 Build-Conflicts: autoconf2.13