[kernel] r14342 - in dists/trunk/linux-2.6/debian: . config/alpha config/amd64 config/armel config/i386 config/i386/xen config/mips config/mipsel templates
Ben Hutchings
benh at alioth.debian.org
Tue Oct 6 23:26:22 UTC 2009
Author: benh
Date: Tue Oct 6 23:26:20 2009
New Revision: 14342
Log:
Improve package descriptions
- Clarify the differences between i386 flavours (Closes: #414690)
- Simplify wording of the description template
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/alpha/defines
dists/trunk/linux-2.6/debian/config/amd64/defines
dists/trunk/linux-2.6/debian/config/armel/defines
dists/trunk/linux-2.6/debian/config/i386/defines
dists/trunk/linux-2.6/debian/config/i386/xen/defines
dists/trunk/linux-2.6/debian/config/mips/defines
dists/trunk/linux-2.6/debian/config/mipsel/defines
dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/changelog Tue Oct 6 23:26:20 2009 (r14342)
@@ -10,6 +10,9 @@
(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)
Modified: dists/trunk/linux-2.6/debian/config/alpha/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/alpha/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -9,12 +9,12 @@
[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
Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -14,8 +14,8 @@
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:
Modified: dists/trunk/linux-2.6/debian/config/armel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/armel/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -12,7 +12,7 @@
[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 @@
[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 @@
[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 @@
[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 @@
[versatile_base]
class: Versatile
-longclass: Versatile (PB, AB, Qemu)
+longclass: Versatile systems (PB, AB, Qemu)
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -17,16 +17,16 @@
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 @@
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 @@
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:
Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -13,8 +13,8 @@
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:
Modified: dists/trunk/linux-2.6/debian/config/mips/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/mips/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -13,24 +13,24 @@
[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)
Modified: dists/trunk/linux-2.6/debian/config/mipsel/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/defines Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/config/mipsel/defines Tue Oct 6 23:26:20 2009 (r14342)
@@ -12,20 +12,20 @@
[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)
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in Tue Oct 6 23:26:20 2009 (r14342)
@@ -3,6 +3,5 @@
Pre-Depends: debconf | debconf-2.0
Depends: module-init-tools
Suggests: linux-doc- at 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 at .
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in Tue Oct 6 23:26:20 2009 (r14342)
@@ -2,12 +2,10 @@
Provides: linux-image, linux-image- at major@
Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${binary:Version})
Suggests: linux-doc- at 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 at .
Package: linux-modules- at 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 at .
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in Tue Oct 6 23:26:20 2009 (r14342)
@@ -2,6 +2,5 @@
Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
Depends: module-init-tools
Suggests: linux-doc- at 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 at .
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in Tue Oct 6 23:26:20 2009 (r14342)
@@ -4,6 +4,5 @@
Depends: module-init-tools, ${shlibs:Depends}
Recommends: firmware-linux-free (>= @source_upstream@)
Suggests: linux-doc- at 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 at .
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in Tue Oct 6 22:45:21 2009 (r14341)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in Tue Oct 6 23:26:20 2009 (r14342)
@@ -2,6 +2,5 @@
Provides: linux-image, linux-image- at major@
Suggests: linux-doc- at 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 at .
More information about the Kernel-svn-changes
mailing list