From 3177d4fbf5af39e42f3f715d71b549a6721f1515 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 4 May 2011 14:37:47 +0100 Subject: [PATCH] Create grub2-common package containing files that are common among GRUB platform packages but that would break GRUB Legacy, or that are too confusing when coinstalled with GRUB Legacy (closes: #564167). --- debian/changelog | 3 ++ debian/control | 32 +++++++++++++------ debian/grub-common.install.in | 1 - debian/grub2-common.install | 7 ++++ debian/{links.in => grub2-common.links} | 0 debian/{manpages.in => grub2-common.manpages} | 0 debian/install.in | 5 --- debian/rules | 6 ++-- 8 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 debian/grub2-common.install rename debian/{links.in => grub2-common.links} (100%) rename debian/{manpages.in => grub2-common.manpages} (100%) diff --git a/debian/changelog b/debian/changelog index c1bfe5473..2bac0ffce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,9 @@ grub2 (1.99~rc2-1) UNRELEASED; urgency=low * Drop versioned dependencies on base-files. GPL-3 has been there for two Debian releases now, and the dependency was never upgrade-critical anyway. + * Create grub2-common package containing files that are common among GRUB + platform packages but that would break GRUB Legacy, or that are too + confusing when coinstalled with GRUB Legacy (closes: #564167). [ Updated translations ] * Belarusian (Viktar Siarheichyk). Closes: #606864 diff --git a/debian/control b/debian/control index a8f845cfd..03a8e82c9 100644 --- a/debian/control +++ b/debian/control @@ -68,16 +68,30 @@ Description: GRand Unified Bootloader, version 2 (dummy package) Package: grub-common Priority: optional Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel -Depends: dpkg (>= 1.15.4) | install-info | dpkg (<= 1.14.25), ${shlibs:Depends}, ${misc:Depends}, gettext-base +Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base Replaces: grub-pc (<< 1.98+20100527-1), grub-ieee1275 (<< 1.98+20100527-1), grub-efi (<< 1.96+20080831-1), grub-coreboot (<< 1.97+20091114-1), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 1.98+20100527-1), grub-efi-amd64 (<< 1.98+20100527-1), grub-yeeloong (<< 1.98+20100527-1) Recommends: os-prober (>= 1.33) Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00) # See bugs #435983 and #455746 -Conflicts: mdadm (<< 2.6.7-2), grub-doc (<< 0.97-32), grub-legacy-doc (<< 0.97-59) +Conflicts: mdadm (<< 2.6.7-2) Breaks: lupin-support (<< 0.30) Multi-Arch: foreign -Description: GRand Unified Bootloader, version 2 (common files) +Description: GRand Unified Bootloader (common files) This package contains common files shared by the distinct flavours of GRUB. + It is shared between GRUB Legacy and GRUB 2, although a number of files + specific to GRUB 2 are here as long as they do not break GRUB Legacy. + +Package: grub2-common +Priority: optional +Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel +Depends: grub-common (= ${binary:Version}), dpkg (>= 1.15.4) | install-info | dpkg (<= 1.14.25), ${shlibs:Depends}, ${misc:Depends} +Replaces: grub, grub-legacy, grub-common (<< 1.99~rc2-1), grub-pc (<< 1.99~rc2-1), grub-ieee1275 (<< 1.99~rc2-1), grub-efi (<< 1.99~rc2-1), grub-coreboot (<< 1.99~rc2-1), grub-linuxbios (<< 1.99~rc2-1), grub-efi-ia32 (<< 1.99~rc2-1), grub-efi-amd64 (<< 1.99~rc2-1), grub-yeeloong (<< 1.99~rc2-1) +Conflicts: grub (<< 0.97-54), grub-legacy, grub-doc (<< 0.97-32), grub-legacy-doc (<< 0.97-59) +Multi-Arch: foreign +Description: GRand Unified Bootloader (common files for version 2) + This package contains common files shared by the distinct flavours of GRUB. + The files in this package are specific to GRUB 2, and would break GRUB + Legacy if installed on the same system. Package: grub-emu Architecture: any-i386 any-amd64 any-powerpc @@ -91,7 +105,7 @@ Description: GRand Unified Bootloader, version 2 (emulated version) Package: grub-pc Priority: optional Architecture: any-i386 any-amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), ucf, freebsd-utils (>= 8.0-4) [kfreebsd-any] +Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), ucf, freebsd-utils (>= 8.0-4) [kfreebsd-any] Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275 Conflicts: grub (<< 0.97-54), grub-legacy, desktop-base (= 4.0.5), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275 Suggests: desktop-base (>= 4.0.6) @@ -127,7 +141,7 @@ Description: GRUB bootable rescue images, version 2 (PC/BIOS version) Package: grub-coreboot Architecture: any-i386 any-amd64 -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf +Depends: ${shlibs:Depends}, grub2-common (= ${binary:Version}), ${misc:Depends}, ucf Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275 Conflicts: grub (<< 0.97-54), grub-legacy, grub-linuxbios (<< ${source:Version}), grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275 Suggests: os-prober @@ -147,7 +161,7 @@ Description: GRand Unified Bootloader, version 2 (Coreboot version) Package: grub-efi-ia32 Architecture: any-i386 any-amd64 -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf, efibootmgr [i386 amd64] +Depends: ${shlibs:Depends}, grub2-common (= ${binary:Version}), ${misc:Depends}, ucf, efibootmgr [i386 amd64] Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275 Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275 Suggests: os-prober @@ -168,7 +182,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 version) Package: grub-efi-amd64 Architecture: i386 kopensolaris-i386 any-amd64 -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf, efibootmgr [i386 amd64] +Depends: ${shlibs:Depends}, grub2-common (= ${binary:Version}), ${misc:Depends}, ucf, efibootmgr [i386 amd64] Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275 Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275 Suggests: os-prober @@ -201,7 +215,7 @@ Description: GRUB bootable rescue images, version 2 (EFI-AMD64 version) Package: grub-ieee1275 Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), +Depends: ${shlibs:Depends}, grub2-common (= ${binary:Version}), powerpc-ibm-utils [any-powerpc any-ppc64], powerpc-utils [any-powerpc any-ppc64], bc [any-powerpc any-ppc64], ${misc:Depends}, ucf Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc @@ -241,7 +255,7 @@ Description: GRUB firmware image for QEMU Package: grub-yeeloong Architecture: any-mipsel -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf +Depends: ${shlibs:Depends}, grub2-common (= ${binary:Version}), ${misc:Depends}, ucf Replaces: grub-common (<< 1.98+20100617-2) Suggests: os-prober Multi-Arch: foreign diff --git a/debian/grub-common.install.in b/debian/grub-common.install.in index 39c9c6234..45d0ce2fa 100644 --- a/debian/grub-common.install.in +++ b/debian/grub-common.install.in @@ -20,7 +20,6 @@ usr/sbin/grub-mkconfig usr/sbin/grub-mkdevicemap usr/sbin/grub-probe usr/share/grub -usr/share/info usr/share/locale usr/share/man/man1/grub-bin2h.1 usr/share/man/man1/grub-editenv.1 diff --git a/debian/grub2-common.install b/debian/grub2-common.install new file mode 100644 index 000000000..dc2dc4b83 --- /dev/null +++ b/debian/grub2-common.install @@ -0,0 +1,7 @@ +../../debian/update-grub usr/sbin + +usr/sbin/grub-reboot +usr/sbin/grub-set-default +usr/share/info +usr/share/man/man8/grub-reboot.8 +usr/share/man/man8/grub-set-default.8 diff --git a/debian/links.in b/debian/grub2-common.links similarity index 100% rename from debian/links.in rename to debian/grub2-common.links diff --git a/debian/manpages.in b/debian/grub2-common.manpages similarity index 100% rename from debian/manpages.in rename to debian/grub2-common.manpages diff --git a/debian/install.in b/debian/install.in index 3ef9c5001..8234894c6 100644 --- a/debian/install.in +++ b/debian/install.in @@ -2,16 +2,11 @@ ../../debian/script usr/share/bug/@PACKAGE@ ../../debian/default usr/share/grub ../../debian/grub.d etc -../../debian/update-grub usr/sbin ../../debian/kernel/zz-update-grub etc/kernel/postinst.d ../../debian/kernel/zz-update-grub etc/kernel/postrm.d usr/lib/grub/*-*/ usr/sbin/grub-install usr/sbin/grub-mknetdir -usr/sbin/grub-reboot -usr/sbin/grub-set-default usr/share/man/man8/grub-install.8 usr/share/man/man8/grub-mknetdir.8 -usr/share/man/man8/grub-reboot.8 -usr/share/man/man8/grub-set-default.8 diff --git a/debian/rules b/debian/rules index 8c0d685eb..774e27660 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ export GRUB_CONTRIB := $(CURDIR)/debian/grub-extras confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" CC=$(CC) TARGET_CC=$(CC) --enable-grub-mkfont -AUTOGEN_DEB_FILES = examples manpages config templates preinst postinst postrm dirs install links +AUTOGEN_DEB_FILES = examples config templates preinst postinst postrm dirs install BUILD_PACKAGES := $(strip $(shell dh_listpackages)) REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-ieee1275 grub-firmware-qemu grub-yeeloong @@ -250,10 +250,10 @@ install/grub-common: override_dh_install: dh_install -pgrub2 -pgrub-linuxbios -pgrub-efi -pgrub-rescue-pc -pgrub-rescue-efi-amd64 -pgrub-firmware-qemu - set -e; for package in grub-common grub-mount-udeb; do \ + set -e; for package in grub-common grub2-common grub-mount-udeb; do \ dh_install -p$$package --sourcedir=debian/tmp-grub-$(COMMON_PLATFORM); \ done - rm -f debian/grub-common/usr/share/info/dir* + rm -f debian/grub2-common/usr/share/info/dir* set -e; for package in grub-pc grub-efi-ia32 grub-efi-amd64 grub-ieee1275 grub-coreboot grub-emu grub-yeeloong; do \ dh_install -p$$package --sourcedir=debian/tmp-$$package; \ done