[kernel] r6485 - in dists/sid/linux-2.6/debian: . arch/amd64 arch/i386

[Bastian Blank]

Author: waldi
Date: Fri Apr 28 20:56:32 2006
New Revision: 6485

Modified:
   dists/sid/linux-2.6/debian/arch/amd64/defines
   dists/sid/linux-2.6/debian/arch/i386/defines
   dists/sid/linux-2.6/debian/changelog
Log:
Conflict with known broken grub versions.

* debian/arch/amd64/defines, debian/arch/i386/defines
  - Conflict with grub in sarge.
  - Suggest known fixed grub version.
* debian/changelog: Update.
Closes: 361308


Modified: dists/sid/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/defines	Fri Apr 28 20:56:32 2006
@@ -11,8 +11,9 @@
  vserver
 
 [image]
+conflicts: grub (<= 0.95+cvs20040624-17)
 depends: e2fsprogs (>= 1.35-7)
-suggests: grub | lilo (>= 19.1)
+suggests: grub (>= 0.97-3) | lilo (>= 19.1)
 
 [amd64-generic]
 class: all x86-64 

Modified: dists/sid/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/defines	Fri Apr 28 20:56:32 2006
@@ -11,7 +11,8 @@
  vserver
 
 [image]
-suggests: grub | lilo (>= 19.1)
+conflicts: grub (<= 0.95+cvs20040624-17)
+suggests: grub (>= 0.97-3) | lilo (>= 19.1)
 
 [686]
 class: PPro/Celeron/PII/PIII/P4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Apr 28 20:56:32 2006
@@ -2,8 +2,9 @@
 
   * Update vserver patch to 2.0.2-rc18.
     - Limit ccaps to root inside a guest
+  * Conflict with known broken grub versions. (closes: #361308) 
 
- -- Bastian Blank <waldi at debian.org>  Fri, 28 Apr 2006 16:08:01 +0200
+ -- Bastian Blank <waldi at debian.org>  Fri, 28 Apr 2006 22:52:13 +0200
 
 linux-2.6 (2.6.16-10) unstable; urgency=low