diff --git a/debian/arch/i386/config.386 b/debian/arch/i386/config.486 similarity index 100% rename from debian/arch/i386/config.386 rename to debian/arch/i386/config.486 diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines index ea0ba69be..3a9bf8de8 100644 --- a/debian/arch/i386/defines +++ b/debian/arch/i386/defines @@ -1,6 +1,6 @@ [base] flavours: - 386 + 486 686 686-smp k7 diff --git a/debian/changelog b/debian/changelog index c656b0038..dc9b1d8ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 ] diff --git a/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 b/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.1 similarity index 100% rename from debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 rename to debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.1 diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in index 4b7908604..d2bb26887 100644 --- a/debian/templates/control.extra.in +++ b/debian/templates/control.extra.in @@ -16,13 +16,13 @@ Depends: linux-image-2.6-alpha-smp 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