r1990 - in trunk: kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian kernel/i386/kernel-latest-2.6-i386/debian kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian kernel-2.4/i386/kernel-latest-2.4-i386/debian

Simon Horman horms@haydn.debian.org
Sun, 12 Dec 2004 20:36:29 -0700


Author: horms
Date: 2004-12-12 20:36:22 -0700 (Sun, 12 Dec 2004)
New Revision: 1990

Modified:
   trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
   trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/control
   trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/changelog
   trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/control
   trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog
   trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control
   trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/changelog
   trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/control
   trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog
   trunk/kernel/i386/kernel-latest-2.6-i386/debian/control
Log:
"Pentium 4", not "Pentium IV" (Bug#284138)


Modified: trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/changelog	2004-12-13 03:36:22 UTC (rev 1990)
@@ -1,3 +1,10 @@
+kernel-image-2.6.8-i386 (2.6.8-11) UNRELEASED; urgency=low
+
+  * Change Pentium IV/PIV to Pentium 4/P4
+    (closes: #284138). (Simon Horman)
+
+ -- Simon Horman <horms@debian.org>  Mon, 13 Dec 2004 12:18:53 +0900
+
 kernel-image-2.6.8-i386 (2.6.8-10) unstable; urgency=high
 
   * Build against 2.6.8-10, fixing an unresolved aic7xxx symbol.

Modified: trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel/i386/kernel-image-2.6.8-i386-2.6.8/debian/control	2004-12-13 03:36:22 UTC (rev 1990)
@@ -60,9 +60,9 @@
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-1
 Provides: kernel-headers, kernel-headers-2.6
-Description: Linux kernel headers 2.6.8 on PPro/Celeron/PII/PIII/PIV
+Description: Linux kernel headers 2.6.8 on PPro/Celeron/PII/PIII/P4
  This package provides kernel header files for version 2.6.8 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4,
  for sites that want the latest kernel headers.
  Please read /usr/share/doc/kernel-headers-2.6.8-1/debian.README.gz for
  details
@@ -75,9 +75,9 @@
 Depends: initrd-tools (>= 0.1.63), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.8 | kernel-source-2.6.8
-Description: Linux kernel image for version 2.6.8 on PPro/Celeron/PII/PIII/PIV.
+Description: Linux kernel image for version 2.6.8 on PPro/Celeron/PII/PIII/P4.
  This package contains the Linux kernel image for version 2.6.8 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4,
  the corresponding System.map file, and the modules built by the packager.
  It also contains scripts that try to ensure that the system is not left in
  a unbootable state after an update.
@@ -97,9 +97,9 @@
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-1
 Provides: kernel-headers, kernel-headers-2.6
-Description: Linux kernel headers 2.6.8 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux kernel headers 2.6.8 on PPro/Celeron/PII/PIII/P4 SMP
  This package provides kernel header files for version 2.6.8 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support,
  for sites that want the latest kernel headers.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  Please read /usr/share/doc/kernel-headers-2.6.8-1/debian.README.gz for
@@ -114,9 +114,9 @@
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: irqbalance
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.8 | kernel-source-2.6.8
-Description: Linux kernel image for version 2.6.8 on PPro/Celeron/PII/PIII/PIV SMP.
+Description: Linux kernel image for version 2.6.8 on PPro/Celeron/PII/PIII/P4 SMP.
  This package contains the Linux kernel image for version 2.6.8 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support,
  the corresponding System.map file, and the modules built by the packager.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  It also contains scripts that try to ensure that the system is not left in

Modified: trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/changelog	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/changelog	2004-12-13 03:36:22 UTC (rev 1990)
@@ -1,3 +1,10 @@
+kernel-image-2.6.9-i386 (2.6.9-4) UNRELEASED; urgency=low
+
+  * Change Pentium IV/PIV to Pentium 4/P4
+    (closes: #284138). (Simon Horman)
+
+ -- Simon Horman <horms@debian.org>  Mon, 13 Dec 2004 12:25:23 +0900
+
 kernel-image-2.6.9-i386 (2.6.9-3) unstable; urgency=low
 
   * Build against 2.6.9-3. 

Modified: trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/control
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/control	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel/i386/kernel-image-2.6.9-i386-2.6.9/debian/control	2004-12-13 03:36:22 UTC (rev 1990)
@@ -60,9 +60,9 @@
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-1
 Provides: kernel-headers, kernel-headers-2.6
-Description: Linux kernel headers 2.6.9 on PPro/Celeron/PII/PIII/PIV
+Description: Linux kernel headers 2.6.9 on PPro/Celeron/PII/PIII/P4
  This package provides kernel header files for version 2.6.9 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4,
  for sites that want the latest kernel headers.
  Please read /usr/share/doc/kernel-headers-2.6.9-1/debian.README.gz for
  details
@@ -75,9 +75,9 @@
 Depends: initrd-tools (>= 0.1.63), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.9 | kernel-source-2.6.9
-Description: Linux kernel image for version 2.6.9 on PPro/Celeron/PII/PIII/PIV.
+Description: Linux kernel image for version 2.6.9 on PPro/Celeron/PII/PIII/P4.
  This package contains the Linux kernel image for version 2.6.9 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4,
  the corresponding System.map file, and the modules built by the packager.
  It also contains scripts that try to ensure that the system is not left in
  a unbootable state after an update.
@@ -97,9 +97,9 @@
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.9-1
 Provides: kernel-headers, kernel-headers-2.6
-Description: Linux kernel headers 2.6.9 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux kernel headers 2.6.9 on PPro/Celeron/PII/PIII/P4 SMP
  This package provides kernel header files for version 2.6.9 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support,
  for sites that want the latest kernel headers.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  Please read /usr/share/doc/kernel-headers-2.6.9-1/debian.README.gz for
@@ -114,9 +114,9 @@
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: irqbalance
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.9 | kernel-source-2.6.9
-Description: Linux kernel image for version 2.6.9 on PPro/Celeron/PII/PIII/PIV SMP.
+Description: Linux kernel image for version 2.6.9 on PPro/Celeron/PII/PIII/P4 SMP.
  This package contains the Linux kernel image for version 2.6.9 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support,
  the corresponding System.map file, and the modules built by the packager.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
  It also contains scripts that try to ensure that the system is not left in

Modified: trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel/i386/kernel-latest-2.6-i386/debian/changelog	2004-12-13 03:36:22 UTC (rev 1990)
@@ -1,3 +1,10 @@
+kernel-latest-2.6-i386 (101) UNRELEASED; urgency=low
+
+  * Change Pentium IV/PIV to Pentium 4/P4
+    (closes: #284138). Simon Horman
+
+ -- Simon Horman <horms@debian.org>  Mon, 13 Dec 2004 12:21:02 +0900
+
 kernel-latest-2.6-i386 (100) unstable; urgency=high
 
   * Release with kernel-image-2.6.8-i386_2.6.8-3 (Andres Salomon).

Modified: trunk/kernel/i386/kernel-latest-2.6-i386/debian/control
===================================================================
--- trunk/kernel/i386/kernel-latest-2.6-i386/debian/control	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel/i386/kernel-latest-2.6-i386/debian/control	2004-12-13 03:36:22 UTC (rev 1990)
@@ -29,27 +29,27 @@
 Section: devel
 Priority: optional
 Depends: kernel-headers-2.6.8-1-686
-Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/PIV
+Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the latest 2.6 kernel headers available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4.
 
 Package: kernel-image-2.6-686
 Architecture: i386
 Section: base
 Priority: optional
 Depends: kernel-image-2.6.8-1-686
-Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/PIV.
+Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/P4.
  This package will always depend on the latest 2.6 kernel image available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4.
 
 Package: kernel-headers-2.6-686-smp
 Architecture: i386
 Section: devel
 Priority: optional
 Depends: kernel-headers-2.6.8-1-686-smp
-Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux kernel headers 2.6 on PPro/Celeron/PII/PIII/P4 SMP
  This package will always depend on the latest 2.6 kernel headers available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
 Package: kernel-image-2.6-686-smp
@@ -57,9 +57,9 @@
 Section: base
 Priority: optional
 Depends: kernel-image-2.6.8-1-686-smp
-Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/PIV SMP.
+Description: Linux kernel image for version 2.6 on PPro/Celeron/PII/PIII/P4 SMP.
  This package will always depend on the latest 2.6 kernel image available
- for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ for Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
 Package: kernel-headers-2.6-k7

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/changelog	2004-12-13 03:36:22 UTC (rev 1990)
@@ -1,3 +1,10 @@
+kernel-image-2.4.27-i386 (2.4.27-8) UNRELEASED; urgency=low
+
+  * Change Pentium IV/PIV to Pentium 4/P4
+    (closes: #284138). (Simon Horman)
+
+ -- Simon Horman <horms@debian.org>  Mon, 13 Dec 2004 12:22:41 +0900
+
 kernel-image-2.4.27-i386 (2.4.27-7) unstable; urgency=high
 
   * Rebuild against gcc-3.3 3.3.4 in an attempt to fix subtle toolchain

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/control	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.27-i386-2.4.27/debian/control	2004-12-13 03:36:22 UTC (rev 1990)
@@ -138,9 +138,9 @@
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.4.27-1
 Provides: kernel-headers, kernel-headers-2.4
-Description: Linux 2.4.27 kernel headers for PPro/Celeron/PII/PIII/PIV
+Description: Linux 2.4.27 kernel headers for PPro/Celeron/PII/PIII/P4
  This package provides common kernel header files for version 2.4.27 for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV, used to build
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4, used to build
  out-of-tree kernel modules and the like. Please read
  /usr/share/doc/kernel-headers-2.4.27-1-686/debian.README.gz for details.
 
@@ -151,9 +151,9 @@
 Provides: kernel-image, kernel-image-2.4
 Depends: initrd-tools (>= 0.1.48), coreutils | fileutils (>= 4.0), modutils (>= 2.4.19)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.4.27 | kernel-source-2.4.27, kernel-pcmcia-modules-2.4.27-1-686 | pcmcia-modules-2.4.27-1-686
-Description: Linux kernel image for version 2.4.27 on PPro/Celeron/PII/PIII/PIV
+Description: Linux kernel image for version 2.4.27 on PPro/Celeron/PII/PIII/P4
  This package contains the Linux kernel image for version 2.4.27 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4,
  the corresponding System.map file, and the modules built by the packager.
  It also contains scripts that try to ensure that the system is not left in
  a unbootable state after an update.
@@ -176,9 +176,9 @@
 Recommends: pcmcia-cs
 Conflicts: pcmcia-modules-2.4.27-1-686
 Replaces: pcmcia-modules-2.4.27-1-686
-Description: Mainstream PCMCIA modules 2.4.27 on PPro/Celeron/PII/PIII/PIV
+Description: Mainstream PCMCIA modules 2.4.27 on PPro/Celeron/PII/PIII/P4
  This package contains the PCMCIA modules compiled for version 2.4.27 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4.
  .
  These modules come from the upstream kernel source, as opposed to pcmcia-cs.
  They may or may not work better than their counter parts in pcmcia-cs.
@@ -191,9 +191,9 @@
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.4.27-1
 Provides: kernel-headers, kernel-headers-2.4
-Description: Linux 2.4.27 kernel headers for PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux 2.4.27 kernel headers for PPro/Celeron/PII/PIII/P4 SMP
  This package provides common kernel header files for version 2.4.27 for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support, used
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support, used
  to build out-of-tree kernel modules and the like. SMP (symmetric multi-
  processing) support is needed if you have more than one CPU.
  Please read /usr/share/doc/kernel-headers-2.4.27-1-686-smp/debian.README.gz
@@ -206,9 +206,9 @@
 Provides: kernel-image, kernel-image-2.4
 Depends: initrd-tools (>= 0.1.48), coreutils | fileutils (>= 4.0), modutils (>= 2.4.19)
 Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.4.27 | kernel-source-2.4.27, kernel-pcmcia-modules-2.4.27-1-686-smp | pcmcia-modules-2.4.27-1-686-smp
-Description: Linux kernel image for version 2.4.27 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux kernel image for version 2.4.27 on PPro/Celeron/PII/PIII/P4 SMP
  This package contains the Linux kernel image for version 2.4.27 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support,
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support,
  the corresponding System.map file, and the modules built by the packager.
  SMP (symmetric multi-processing) is needed if you have more than one CPU.
  It also contains scripts that try to ensure that the system is not left in
@@ -232,9 +232,9 @@
 Recommends: pcmcia-cs
 Conflicts: pcmcia-modules-2.4.27-1-686-smp
 Replaces: pcmcia-modules-2.4.27-1-686-smp
-Description: Mainstream PCMCIA modules 2.4.27 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Mainstream PCMCIA modules 2.4.27 on PPro/Celeron/PII/PIII/P4 SMP
  This package contains the PCMCIA modules compiled for version 2.4.27 on
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support.
  SMP (symmetric multi-processing) is needed if you have more than one CPU.
  .
  These modules come from the upstream kernel source, as opposed to pcmcia-cs.

Modified: trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/changelog	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/changelog	2004-12-13 03:36:22 UTC (rev 1990)
@@ -1,3 +1,10 @@
+kernel-latest-2.4-i386 (101) UNRELEASED; urgency=low
+
+  * Change Pentium IV/PIV to Pentium 4/P4
+    (closes: #284138). (Simon Horman)
+
+ -- Simon Horman <horms@debian.org>  Mon, 13 Dec 2004 12:24:18 +0900
+
 kernel-latest-2.4-i386 (100) unstable; urgency=low
 
   * Created this package for meta packages that had

Modified: trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/control
===================================================================
--- trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/control	2004-12-13 01:20:53 UTC (rev 1989)
+++ trunk/kernel-2.4/i386/kernel-latest-2.4-i386/debian/control	2004-12-13 03:36:22 UTC (rev 1990)
@@ -67,28 +67,28 @@
 Section: base
 Priority: optional
 Depends: kernel-image-2.4.27-1-686
-Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/PIV
+Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the latest 2.4 kernel image available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4.
 
 Package: kernel-pcmcia-modules-2.4-686
 Architecture: i386
 Section: base
 Priority: optional
 Depends: kernel-pcmcia-modules-2.4.27-1-686
-Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/PIV
+Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the latest 2.4 mainstream PCMCIA modules
  available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV.
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4.
 
 Package: kernel-headers-2.4-686
 Architecture: i386
 Section: base
 Priority: optional
 Depends: kernel-headers-2.4.27-1-686
-Description: Linux kernel headers for version 2.4 on PPro/Celeron/PII/PIII/PIV
+Description: Linux kernel headers for version 2.4 on PPro/Celeron/PII/PIII/P4
  This package will always depend on the latest 2.4 kernel headers available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV, used to build
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4, used to build
  out-of-tree kernel modules and the like.
 
 Package: kernel-image-2.4-686-smp
@@ -96,9 +96,9 @@
 Section: base
 Priority: optional
 Depends: kernel-image-2.4.27-1-686-smp
-Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux kernel image for version 2.4 on PPro/Celeron/PII/PIII/P4 SMP
  This package will always depend on the latest 2.4 kernel image available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
 Package: kernel-pcmcia-modules-2.4-686-smp
@@ -106,10 +106,10 @@
 Section: base
 Priority: optional
 Depends: kernel-pcmcia-modules-2.4.27-1-686-smp
-Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Mainstream PCMCIA modules for version 2.4 on PPro/Celeron/PII/PIII/P4 SMP
  This package will always depend on the latest 2.4 mainstream PCMCIA modules
  available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support.
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support.
  SMP (symmetric multi-processing) is needed if you have multiple processors.
 
 Package: kernel-headers-2.4-686-smp
@@ -117,9 +117,9 @@
 Section: base
 Priority: optional
 Depends: kernel-headers-2.4.27-1-686-smp
-Description: Linux kernel headers for version 2.4 on PPro/Celeron/PII/PIII/PIV SMP
+Description: Linux kernel headers for version 2.4 on PPro/Celeron/PII/PIII/P4 SMP
  This package will always depend on the latest 2.4 kernel headers available for
- Pentium Pro/Celeron/Pentium II/Pentium III/Pentium IV with SMP support, used
+ Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support, used
  to build out-of-tree kernel modules and the like.
  SMP (symmetric multi-processing) is needed if you have multiple processors.