diff --git a/debian/changelog b/debian/changelog index 03c228e7e..258ba7451 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ linux-2.6 (2.6.31-1~experimental.2) UNRELEASED; urgency=low (Closes: #549002) * Add support for DEB_BUILD_OPTIONS=parallel=N (Closes: #458560) * sfc: Fix initial link state + * Improve package descriptions + - Clarify the differences between i386 flavours (Closes: #414690) + - Simplify wording of the description template [ maximilian attems ] * Add stable release 2.6.31.2 (Closes: #522828) diff --git a/debian/config/alpha/defines b/debian/config/alpha/defines index ad80e821a..aaf51f499 100644 --- a/debian/config/alpha/defines +++ b/debian/config/alpha/defines @@ -9,12 +9,12 @@ suggests: aboot, fdutils [alpha-generic_base] class: Alpha -longclass: DEC Alpha with extended kernel start address (Wildfire, Titan, Marvel) +longclass: DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel) [alpha-smp_base] class: Alpha SMP -longclass: DEC Alpha/SMP with extended kernel start address (Wildfire, Titan, Marvel) +longclass: DEC Alpha SMP systems with extended kernel start address (Wildfire, Titan, Marvel) [alpha-legacy_base] class: Alpha Legacy -longclass: DEC Alpha with legacy kernel start address +longclass: DEC Alpha systems with legacy kernel start address diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 739b2c2f6..ff2cd4dec 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -14,8 +14,8 @@ configs: suggests: grub | lilo [amd64_base] -class: AMD64 -longclass: all 64bit single- and multiprocessor AMD and Intel +class: 64-bit PCs +longclass: PCs with AMD64 or Intel 64 processors [amd64_image] configs: diff --git a/debian/config/armel/defines b/debian/config/armel/defines index e60592991..3069fc856 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -12,7 +12,7 @@ suggests: fdutils [iop32x_base] class: IOP32x -longclass: IOP32x based (Thecus N2100, etc) +longclass: IOP32x based systems (Thecus N2100, etc) [iop32x_build] image-file: arch/arm/boot/zImage @@ -23,7 +23,7 @@ check-size: 1441784 [ixp4xx_base] class: IXP4xx -longclass: IXP4xx based (Linksys NSLU2, etc) +longclass: IXP4xx based systems (Linksys NSLU2, etc) [ixp4xx_build] image-file: arch/arm/boot/zImage @@ -34,7 +34,7 @@ check-size: 1441760 [kirkwood_base] class: Marvell Kirkwood -longclass: Marvell Kirkwood based (SheevaPlug, QNAP TS-119/TS-219, etc) +longclass: Marvell Kirkwood based systems (SheevaPlug, QNAP TS-119/TS-219, etc) [kirkwood_build] image-file: arch/arm/boot/zImage @@ -47,7 +47,7 @@ check-size: 2097080 [orion5x_base] class: Marvell Orion -longclass: Marvell Orion 5181, 5182 and 5281 based (QNAP TS-109/TS-209, etc) +longclass: Marvell Orion 5181, 5182 and 5281 based systems (QNAP TS-109/TS-209, etc) [orion5x_build] image-file: arch/arm/boot/zImage @@ -61,4 +61,4 @@ check-size: 1572792 [versatile_base] class: Versatile -longclass: Versatile (PB, AB, Qemu) +longclass: Versatile systems (PB, AB, Qemu) diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 38fba75c6..dc418576f 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -17,16 +17,16 @@ configs: suggests: grub | lilo [486_base] -class: x86 -longclass: x86 and compatible +class: old PCs +longclass: PCs with a 486, Pentium or compatible processor [486_image] configs: kernelarch-x86/config-arch-32 [686_base] -class: PPro/Celeron/PII/PIII/P4 -longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 +class: modern PCs +longclass: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors [686_image] configs: @@ -34,8 +34,8 @@ configs: recommends: libc6-i686 [686-bigmem_base] -class: PPro/Celeron/PII/PIII/P4 -longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM +class: PCs with 4GB+ RAM +longclass: PCs with 4-64GB RAM, using PAE (Physical Address Extension) [686-bigmem_image] configs: @@ -44,8 +44,8 @@ desc-parts: xen recommends: libc6-i686 [amd64_base] -class: AMD64 -longclass: all 64bit single- and multiprocessor AMD and Intel +class: 64-bit PCs +longclass: PCs with AMD64 or Intel 64 processors [amd64_image] configs: diff --git a/debian/config/i386/xen/defines b/debian/config/i386/xen/defines index 8e66961c6..090486877 100644 --- a/debian/config/i386/xen/defines +++ b/debian/config/i386/xen/defines @@ -13,8 +13,8 @@ flavours: amd64 [686_base] -class: i686 -longclass: i686 and compatible +class: modern PCs +longclass: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core, Atom; AMD K6, Athlon, Duron, Opteron, Sempron, Turion, Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors [686_image] configs: diff --git a/debian/config/mips/defines b/debian/config/mips/defines index 9ef8a94c2..a2c7962b9 100644 --- a/debian/config/mips/defines +++ b/debian/config/mips/defines @@ -13,24 +13,24 @@ initramfs: false [r4k-ip22_base] class: SGI IP22 -longclass: SGI IP22 (Indy, Indigo2) +longclass: SGI IP22 systems (Indy, Indigo2) [r5k-ip32_base] class: SGI IP32 -longclass: SGI IP32 (O2) +longclass: SGI IP32 systems (O2) [sb1-bcm91250a_base] class: BCM91250A -longclass: Broadcom BCM91250A (aka SWARM) +longclass: Broadcom BCM91250A systems (aka SWARM) [sb1a-bcm91480b_base] class: BCM91480B -longclass: Broadcom BCM91480B (aka BigSur) +longclass: Broadcom BCM91480B systems (aka BigSur) [4kc-malta_base] class: MIPS Malta -longclass: MIPS Malta board +longclass: MIPS Malta boards [5kc-malta_base] class: MIPS Malta (64-bit) -longclass: MIPS Malta board (64-bit) +longclass: MIPS Malta boards (64-bit) diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines index ac9da7974..99ba0c23a 100644 --- a/debian/config/mipsel/defines +++ b/debian/config/mipsel/defines @@ -12,20 +12,20 @@ initramfs: false [r5k-cobalt_base] class: Cobalt -longclass: Cobalt (Qube, RaQ, Qube2, RaQ2) +longclass: Cobalt systems (Qube, RaQ, Qube2, RaQ2) [sb1-bcm91250a_base] class: BCM91250A -longclass: Broadcom BCM91250A (aka SWARM) +longclass: Broadcom BCM91250A systems (aka SWARM) [sb1a-bcm91480b_base] class: BCM91480B -longclass: Broadcom BCM91480B (aka BigSur) +longclass: Broadcom BCM91480B systems (aka BigSur) [4kc-malta_base] class: MIPS Malta -longclass: MIPS Malta board +longclass: MIPS Malta boards [5kc-malta_base] class: MIPS Malta (64-bit) -longclass: MIPS Malta board (64-bit) +longclass: MIPS Malta boards (64-bit) diff --git a/debian/templates/control.image.type-kernel-package.in b/debian/templates/control.image.type-kernel-package.in index b3f27b0cd..d35c4a525 100644 --- a/debian/templates/control.image.type-kernel-package.in +++ b/debian/templates/control.image.type-kernel-package.in @@ -3,6 +3,5 @@ Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abin Pre-Depends: debconf | debconf-2.0 Depends: module-init-tools Suggests: linux-doc-@version@ -Description: Linux @upstreamversion@ image on @class@ - This package provides the binary image and pre-built loadable modules for - Linux kernel @upstreamversion@ on @longclass@ machines. +Description: Linux @upstreamversion@ for @class@ + The Linux kernel @upstreamversion@ and modules for use on @longclass@. diff --git a/debian/templates/control.image.type-modulesextra.in b/debian/templates/control.image.type-modulesextra.in index bc6d1d834..498193032 100644 --- a/debian/templates/control.image.type-modulesextra.in +++ b/debian/templates/control.image.type-modulesextra.in @@ -2,12 +2,10 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@ Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}) Suggests: linux-doc-@version@ -Description: Linux @upstreamversion@ image on @class@ - This package provides the binary image for - Linux kernel @upstreamversion@ on @longclass@ machines. +Description: Linux @upstreamversion@ for @class@ + The Linux kernel @upstreamversion@ for use on @longclass@. Package: linux-modules-@upstreamversion@@abiname@@localversion@ Depends: module-init-tools -Description: Linux @upstreamversion@ modules on @class@ - This package provides pre-built loadable modules for - Linux kernel @version@ on @longclass@ machines. +Description: Linux @upstreamversion@ modules for @class@ + Modules for Linux kernel @upstreamversion@ for use on @longclass@. diff --git a/debian/templates/control.image.type-modulesinline.in b/debian/templates/control.image.type-modulesinline.in index 2151ce0eb..dae73fa9c 100644 --- a/debian/templates/control.image.type-modulesinline.in +++ b/debian/templates/control.image.type-modulesinline.in @@ -2,6 +2,5 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ Depends: module-init-tools Suggests: linux-doc-@version@ -Description: Linux @upstreamversion@ image on @class@ - This package provides the binary image and pre-built loadable modules for - Linux kernel @upstreamversion@ on @longclass@ machines. +Description: Linux @upstreamversion@ for @class@ + The Linux kernel @upstreamversion@ for use on @longclass@. diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.type-plain.in index 92a96bacf..1dda400bd 100644 --- a/debian/templates/control.image.type-plain.in +++ b/debian/templates/control.image.type-plain.in @@ -4,6 +4,5 @@ Pre-Depends: debconf | debconf-2.0 Depends: module-init-tools, ${shlibs:Depends} Recommends: firmware-linux-free (>= @source_upstream@) Suggests: linux-doc-@version@ -Description: Linux @upstreamversion@ image on @class@ - This package provides the binary image and pre-built loadable modules for - Linux kernel @upstreamversion@ on @longclass@ machines. +Description: Linux @upstreamversion@ for @class@ + The Linux kernel @upstreamversion@ and modules for use on @longclass@. diff --git a/debian/templates/control.image.type-standalone.in b/debian/templates/control.image.type-standalone.in index 8add82a44..4036d3212 100644 --- a/debian/templates/control.image.type-standalone.in +++ b/debian/templates/control.image.type-standalone.in @@ -2,6 +2,5 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Provides: linux-image, linux-image-@major@ Suggests: linux-doc-@version@ Depends: ${shlibs:Depends} -Description: Linux @upstreamversion@ image on @class@ - This package provides the binary image for - Linux kernel @upstreamversion@ on @longclass@ machines. +Description: Linux @upstreamversion@ for @class@ + The Linux kernel @upstreamversion@ for use on @longclass@.