[kernel] r6490 - in dists/trunk/linux-2.6: . debian debian/arch/amd64 debian/arch/i386

[Bastian Blank]

Author: waldi
Date: Fri Apr 28 22:01:54 2006
New Revision: 6490

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/amd64/defines
   dists/trunk/linux-2.6/debian/arch/i386/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines	Fri Apr 28 22:01:54 2006
@@ -13,8 +13,9 @@
  xen-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/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines	Fri Apr 28 22:01:54 2006
@@ -13,7 +13,8 @@
  xen-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/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Apr 28 22:01:54 2006
@@ -13,8 +13,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
 

Modified: dists/trunk/linux-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-2.6/debian/rules	(original)
+++ dists/trunk/linux-2.6/debian/rules	Fri Apr 28 22:01:54 2006
@@ -37,7 +37,7 @@
 	@[ -d $@ ] || mkdir $@
 
 orig: ../orig/linux-$(MAJOR)-$(VERSION)
-	rsync --delete --exclude debian --exclude .svn --link-dest=../orig/linux-$(MAJOR)-$(VERSION)/ -av ../orig/linux-$(MAJOR)-$(VERSION)/ .
+	rsync --delete --exclude debian --exclude .svn --link-dest=../orig/linux-$(MAJOR)-$(VERSION)/ -a ../orig/linux-$(MAJOR)-$(VERSION)/ .
 
 ../orig/linux-$(MAJOR)-$(VERSION):
 	if [ -f "../linux-$(MAJOR)_$(VERSION).orig.tar.gz" ]; then \