Remove kernel-specific grub.d conffiles that were dropped from packages

built for all but their corresponding kernel type in 1.96+20090307-1
(closes: #703539).
This commit is contained in:
Colin Watson 2013-03-22 11:25:01 +00:00
parent 4fafc53b27
commit 7c1726c78e
5 changed files with 13 additions and 1 deletions

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ grub2 (2.00-14) UNRELEASED; urgency=low
* Merge from Ubuntu: * Merge from Ubuntu:
- Don't call update-grub in the zz-update-grub kernel hook if - Don't call update-grub in the zz-update-grub kernel hook if
/boot/grub/grub.cfg doesn't exist. /boot/grub/grub.cfg doesn't exist.
* Remove kernel-specific grub.d conffiles that were dropped from packages
built for all but their corresponding kernel type in 1.96+20090307-1
(closes: #703539).
-- Colin Watson <cjwatson@debian.org> Wed, 13 Mar 2013 10:05:17 +0000 -- Colin Watson <cjwatson@debian.org> Wed, 13 Mar 2013 10:05:17 +0000

View File

@ -0,0 +1,3 @@
# Removed in 1.96+20090307-1.
rm_conffile /etc/grub.d/10_freebsd 2.00-14~
rm_conffile /etc/grub.d/10_linux 2.00-14~

View File

@ -0,0 +1,3 @@
# Removed in 1.96+20090307-1.
rm_conffile /etc/grub.d/10_hurd 2.00-14~
rm_conffile /etc/grub.d/10_linux 2.00-14~

View File

@ -0,0 +1,3 @@
# Removed in 1.96+20090307-1.
rm_conffile /etc/grub.d/10_freebsd 2.00-14~
rm_conffile /etc/grub.d/10_hurd 2.00-14~

2
debian/rules vendored
View File

@ -35,7 +35,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 confflags = PACKAGE_VERSION="$(deb_version)" PACKAGE_STRING="GRUB $(deb_version)" CC=$(CC) TARGET_CC=$(CC) --enable-grub-mkfont
AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links AUTOGEN_DEB_FILES = config templates preinst postinst postrm dirs install links maintscript
BUILD_PACKAGES := $(strip $(shell dh_listpackages)) BUILD_PACKAGES := $(strip $(shell dh_listpackages))
REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-ieee1275 grub-firmware-qemu grub-yeeloong REAL_PACKAGES = grub-emu grub-pc grub-coreboot grub-efi-ia32 grub-efi-amd64 grub-efi-ia64 grub-ieee1275 grub-firmware-qemu grub-yeeloong