Revert r956.

diff --git a/debian/changelog b/debian/changelog
index 7360632c65b81c7fd5702a8c91d81a214092509d..4691e09bd0ea7eceb1dd5d17d0bec3d74b3abc0c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,10 @@ grub2 (1.96+20080806-1) experimental; urgency=low
   [ Robert Millan ]
   * Make build-dependency on unifont-bin versioned (<< 1:5.1.20080706-1) to
     avoid being hit by #494473.
+  * Move a few files to grub-common and remove them from the arch-
+    specific packages.
 
- -- Robert Millan <rmh@aybabtu.com>  Sat,  9 Aug 2008 21:23:51 +0200
+ -- Robert Millan <rmh@aybabtu.com>  Sun, 10 Aug 2008 01:08:18 +0200
 
 grub2 (1.96+20080730-1) experimental; urgency=low
 

diff --git a/debian/control b/debian/control
index 87c29be9fa4299cf56b4cfc458ae274b152ec760..91d125ceaf1fe8051fe3dfe94bd4f137e78a5c80 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
 Package: grub-common
 Architecture: i386 kfreebsd-i386 hurd-i386 amd64 kfreebsd-amd64 powerpc ppc64
 Depends: ${shlibs:Depends}, base-files (>= 4.0.1~)
-Replaces: grub-pc (<< 1.96+20080426-3), grub-ieee1275 (<< 1.96+20080426-3), grub-linuxbios (<< 1.96+20080426-3), grub-efi (<< 1.96+20080426-3)
+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]
 Description: GRand Unified Bootloader, version 2 (common files)
  This package contains common files shared by the distinct flavours of GRUB.