From 2d69ca0d6876bc6efd4a2b51ba1b89905210e125 Mon Sep 17 00:00:00 2001 From: rmh Date: Mon, 8 Jun 2009 10:44:23 +0000 Subject: [PATCH] Add kopensolaris-i386 to arch list. --- debian/changelog | 3 ++- debian/control | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index d10181bdd..e763ef404 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ grub2 (1.96+20090608-1) experimental; urgency=low [ Robert Millan ] * Split grub-efi in grub-efi-ia32 and grub-efi-amd64, both available on i386 and amd64. (Closes: #524756) + * Add kopensolaris-i386 to arch list. [ New translations ] * Catalan (ca.po) by Jordi Mallach. @@ -17,7 +18,7 @@ grub2 (1.96+20090608-1) experimental; urgency=low * Change upgrade-from-grub-legacy to use `dpkg-reconfigure grub-pc' to install grub2 into MBR. - -- Felix Zielcke Mon, 08 Jun 2009 09:33:01 +0200 + -- Robert Millan Mon, 08 Jun 2009 12:44:05 +0200 grub2 (1.96+20090603-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 3506df352..f2b5a74fb 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: cdbs, po-debconf, help2man, libncurses5-dev, - genisoimage [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia], + genisoimage [i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia], libc6-dev-i386 [amd64], libc0.1-dev-i386 [kfreebsd-amd64], libc6-dev-powerpc [ppc64], gcc-multilib [amd64 kfreebsd-amd64 ppc64], bf-utf-source, @@ -26,37 +26,37 @@ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grub/grub2/ Package: grub2 -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 -Depends: grub-pc [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia] | grub-ieee1275 [powerpc ppc64], ${misc:Depends} +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 +Depends: grub-pc [i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia] | grub-ieee1275 [powerpc ppc64], ${misc:Depends} Description: GRand Unified Bootloader, version 2 (dummy package) This is a dummy transitional package to handle GRUB 2 upgrades. It can be safely removed. Package: grub-linuxbios -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia Depends: grub-coreboot (= ${binary:Version}), ${misc:Depends} Description: GRand Unified Bootloader, version 2 (dummy package) This is a dummy transitional package that depends on grub-coreboot. Package: grub-efi -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia -Depends: ${misc:Depends}, grub-efi-ia32 [i386 kfreebsd-i386 hurd-i386 lpia], grub-efi-amd64 [amd64 kfreebsd-amd64] +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia +Depends: ${misc:Depends}, grub-efi-ia32 [i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 lpia], grub-efi-amd64 [amd64 kfreebsd-amd64] Description: GRand Unified Bootloader, version 2 (dummy package) This is a dummy transitional package that depends on either grub-efi-ia32 or grub-efi-amd64, depending on the architecture. Package: grub-common -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 Depends: ${shlibs:Depends}, base-files (>= 4.0.1~), ${misc:Depends} Replaces: grub-pc (<< 1.96+20080804-1), grub-ieee1275 (<< 1.96+20080804-1), grub-efi (<< 1.96+20080804-1), grub-coreboot (<< 1.96+20080804-1), grub-linuxbios (<< 1.96+20080426-3) -Suggests: multiboot-doc [i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia] +Suggests: multiboot-doc [i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia] # See bugs #435983 and #455746 Conflicts: mdadm (<< 2.6.7-2), dmsetup (<< 2:1.02.27-2) Description: GRand Unified Bootloader, version 2 (common files) This package contains common files shared by the distinct flavours of GRUB. Package: grub-pc -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}) Provides: grub Replaces: grub, grub2 (<< ${source:Version}), grub-common (= ${binary:Version}) @@ -80,7 +80,7 @@ Description: GRand Unified Bootloader, version 2 (PC/BIOS version) traditional PC/BIOS architecture. Package: grub-rescue-pc -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia Depends: base-files (>= 4.0.1~), ${misc:Depends} Description: GRUB bootable rescue images, version 2 (PC/BIOS version) This package contains two GRUB rescue images that have been built for use with @@ -90,7 +90,7 @@ Description: GRUB bootable rescue images, version 2 (PC/BIOS version) - grub-rescue-cdrom.iso: El Torito CDROM image. Package: grub-coreboot -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends} Provides: grub Replaces: grub, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1) @@ -110,7 +110,7 @@ Description: GRand Unified Bootloader, version 2 (Coreboot version) platforms running the Coreboot firmware. Package: grub-efi-ia32 -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends} Provides: grub Replaces: grub, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi @@ -131,7 +131,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 version) a BIOS interface has been activated). Package: grub-efi-amd64 -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends} Provides: grub Replaces: grub, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1) @@ -152,7 +152,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 version) a BIOS interface has been activated). Package: grub-ieee1275 -Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 +Architecture: i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64 lpia powerpc ppc64 Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), powerpc-ibm-utils [powerpc ppc64], powerpc-utils [powerpc ppc64], bc [powerpc ppc64], ${misc:Depends} Provides: grub