[kernel] r4987 - in dists/trunk/linux-2.6/debian: . arch/i386 patches-debian/series templates

[Frederik Schüler]

Author: fschueler-guest
Date: Wed Dec  7 19:07:14 2005
New Revision: 4987

Added:
   dists/trunk/linux-2.6/debian/arch/i386/config.486
      - copied unchanged from r4969, dists/trunk/linux-2.6/debian/arch/i386/config.386
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.1
      - copied unchanged from r4974, dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1
Removed:
   dists/trunk/linux-2.6/debian/arch/i386/config.386
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1
Modified:
   dists/trunk/linux-2.6/debian/arch/i386/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/control.extra.in
Log:
Rename i386 386 flavour to 486.


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	Wed Dec  7 19:07:14 2005
@@ -1,6 +1,6 @@
 [base]
 flavours:
- 386
+ 486
  686
  686-smp
  k7

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Dec  7 19:07:14 2005
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) UNRELEASED; urgency=low
+
+  * New upstream release candidate.
+  * Rename i386 368 flavour to 486.
+
+ -- Frederik Schüler <fs at debian.org>  Sun,  4 Dec 2005 21:34:52 +0100
+
 linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) experimental; urgency=low
 
   [ Frederik Schüler ]

Modified: dists/trunk/linux-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.extra.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.extra.in	Wed Dec  7 19:07:14 2005
@@ -16,13 +16,13 @@
 Description: Linux kernel 2.6 image on Alpha SMP machines - transition package
  This package is for transition only.
 
-Package: kernel-image-2.6-386
+Package: kernel-image-2.6-486
 X-Version-Overwrite-Epoch: 1
 Architecture: i386
 Section: base
 Priority: extra
-Depends: linux-image-2.6-386
-Description: Linux kernel 2.6.12 image on 386-class machines - transition package
+Depends: linux-image-2.6-486
+Description: Linux kernel 2.6.12 image on 486-class machines - transition package
  This package is for transition only.
 
 Package: kernel-image-2.6-686