From d50309dcd630c7c394d124668c8f4ae1be1fc12d Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 17 Jul 2006 09:06:10 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/templates/control.extra.in, debian/templates/control.image.latest.in, debian/templates/control.image.type-modulesextra.in, debian/templates/control.image.type-modulesinline.in, debian/templates/control.image.type-standalone.in: Set section to admin. svn path=/dists/trunk/linux-2.6/; revision=7032 --- debian/changelog | 3 +- debian/templates/control.extra.in | 64 +++++++++---------- debian/templates/control.image.latest.in | 4 +- .../control.image.type-modulesextra.in | 4 +- .../control.image.type-modulesinline.in | 2 +- .../control.image.type-standalone.in | 2 +- 6 files changed, 40 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 001b72708..86b47c229 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ linux-2.6 (2.6.17-4) UNRELEASED; urgency=low - Fix nasty /proc vulnerability (CVE-2006-3626) * Add stable release 2.6.17.6: - Relax /proc fix a bit + * Set section of images to admin. [ dann frazier ] * [ia64] Drop the non-SMP flavours; they are not well maintained upstream. @@ -13,7 +14,7 @@ linux-2.6 (2.6.17-4) UNRELEASED; urgency=low flavours if upstream resolved the issue - but that never happened. Note that this is a measurable performance penalty on non-SMP systems. - -- dann frazier Sun, 16 Jul 2006 23:07:54 -0600 + -- Bastian Blank Mon, 17 Jul 2006 11:03:54 +0200 linux-2.6 (2.6.17-3) unstable; urgency=low diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in index 492fa98f7..02b56d7bd 100644 --- a/debian/templates/control.extra.in +++ b/debian/templates/control.extra.in @@ -1,7 +1,7 @@ Package: kernel-image-2.6-generic X-Version-Overwrite-Epoch: 1 Architecture: alpha -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-alpha-generic Description: Linux kernel 2.6 image on Alpha machines - transition package @@ -10,7 +10,7 @@ Description: Linux kernel 2.6 image on Alpha machines - transition package Package: kernel-image-2.6-smp X-Version-Overwrite-Epoch: 1 Architecture: alpha -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-alpha-smp Description: Linux kernel 2.6 image on Alpha SMP machines - transition package @@ -18,7 +18,7 @@ Description: Linux kernel 2.6 image on Alpha SMP machines - transition package Package: linux-image-2.6-amd64-generic Architecture: amd64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-amd64-k8 Description: Linux kernel 2.6 image on all x86-64 machines - transition package @@ -27,7 +27,7 @@ Description: Linux kernel 2.6 image on all x86-64 machines - transition package Package: kernel-image-2.6-386 X-Version-Overwrite-Epoch: 1 Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-486 Description: Linux kernel 2.6 image on 486-class machines - transition package @@ -36,7 +36,7 @@ Description: Linux kernel 2.6 image on 486-class machines - transition package Package: kernel-image-2.6-686 X-Version-Overwrite-Epoch: 1 Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-686 Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 machines - transition package @@ -45,7 +45,7 @@ Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 machines - trans Package: kernel-image-2.6-686-smp X-Version-Overwrite-Epoch: 1 Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-686-smp Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - transition package @@ -53,7 +53,7 @@ Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - t Package: linux-image-2.6-686-smp Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-686 Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - transition package @@ -62,7 +62,7 @@ Description: Linux kernel 2.6 image on PPro/Celeron/PII/PIII/P4 SMP machines - t Package: kernel-image-2.6-k7 X-Version-Overwrite-Epoch: 1 Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-k7 Description: Linux kernel 2.6 image on AMD K7 machines - transition package @@ -71,7 +71,7 @@ Description: Linux kernel 2.6 image on AMD K7 machines - transition package Package: kernel-image-2.6-k7-smp X-Version-Overwrite-Epoch: 1 Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-k7-smp Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package @@ -79,7 +79,7 @@ Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package Package: linux-image-2.6-k7-smp Architecture: i386 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-k7 Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package @@ -88,7 +88,7 @@ Description: Linux kernel 2.6 image on AMD K7 SMP machines - transition package Package: kernel-image-2.6-itanium X-Version-Overwrite-Epoch: 1 Architecture: ia64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-itanium Description: Linux kernel 2.6 image on Itanium machines - transition package @@ -97,7 +97,7 @@ Description: Linux kernel 2.6 image on Itanium machines - transition package Package: kernel-image-2.6-itanium-smp X-Version-Overwrite-Epoch: 1 Architecture: ia64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-itanium-smp Description: Linux kernel 2.6 image on multi-processor Itanium machines - transition package @@ -106,7 +106,7 @@ Description: Linux kernel 2.6 image on multi-processor Itanium machines - transi Package: kernel-image-2.6-mckinley X-Version-Overwrite-Epoch: 1 Architecture: ia64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-mckinley Description: Linux kernel 2.6 image on Itanium II machines - transition package @@ -115,7 +115,7 @@ Description: Linux kernel 2.6 image on Itanium II machines - transition package Package: kernel-image-2.6-mckinley-smp X-Version-Overwrite-Epoch: 1 Architecture: ia64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-mckinley-smp Description: Linux kernel 2.6 image on multi-processor Itanium II machines - transition package @@ -123,7 +123,7 @@ Description: Linux kernel 2.6 image on multi-processor Itanium II machines - tra Package: linux-image-2.6-itanium-smp Architecture: ia64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-itanium Description: Linux kernel 2.6 image on Itanium machines - transition package @@ -131,7 +131,7 @@ Description: Linux kernel 2.6 image on Itanium machines - transition package Package: linux-image-2.6-mckinley-smp Architecture: ia64 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-mckinley Description: Linux kernel 2.6 image on Itanium II machines - transition package @@ -140,7 +140,7 @@ Description: Linux kernel 2.6 image on Itanium II machines - transition package Package: kernel-image-powerpc X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-powerpc Description: Linux kernel image on powerpc-class machines - transition package @@ -149,7 +149,7 @@ Description: Linux kernel image on powerpc-class machines - transition package Package: kernel-image-2.6-powerpc X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-powerpc Description: Linux kernel 2.6 image on powerpc-class machines - transition package @@ -158,7 +158,7 @@ Description: Linux kernel 2.6 image on powerpc-class machines - transition packa Package: kernel-image-powerpc-smp X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-powerpc-smp Description: Linux kernel image on powerpc-smp-class machines - transition package @@ -167,7 +167,7 @@ Description: Linux kernel image on powerpc-smp-class machines - transition packa Package: kernel-image-2.6-powerpc-smp X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-powerpc-smp Description: Linux kernel 2.6 image on powerpc-smp-class machines - transition package @@ -176,7 +176,7 @@ Description: Linux kernel 2.6 image on powerpc-smp-class machines - transition p Package: kernel-image-power3 X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-powerpc64 Description: linux kernel image on power3 - transition package @@ -185,7 +185,7 @@ Description: linux kernel image on power3 - transition package Package: kernel-image-2.6-power3 X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-powerpc64 Description: linux kernel 2.6 image on power3 - transition package @@ -194,7 +194,7 @@ Description: linux kernel 2.6 image on power3 - transition package Package: kernel-image-power3-smp X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-powerpc64 Description: linux kernel image on power3 - transition package @@ -203,7 +203,7 @@ Description: linux kernel image on power3 - transition package Package: kernel-image-2.6-power3-smp X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-powerpc64 Description: linux kernel 2.6 image on power3 - transition package @@ -212,7 +212,7 @@ Description: linux kernel 2.6 image on power3 - transition package Package: kernel-image-power4 X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-powerpc64 Description: linux kernel image on power4/G5 - transition package @@ -221,7 +221,7 @@ Description: linux kernel image on power4/G5 - transition package Package: kernel-image-2.6-power4 X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-powerpc64 Description: linux kernel 2.6 image on power4/G5 - transition package @@ -230,7 +230,7 @@ Description: linux kernel 2.6 image on power4/G5 - transition package Package: kernel-image-power4-smp X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-powerpc64 Description: linux kernel image on power4/G5 - transition package @@ -239,7 +239,7 @@ Description: linux kernel image on power4/G5 - transition package Package: kernel-image-2.6-power4-smp X-Version-Overwrite-Epoch: 1 Architecture: powerpc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-powerpc64 Description: linux kernel 2.6 image on SMP power4/G5 - transition package @@ -247,7 +247,7 @@ Description: linux kernel 2.6 image on SMP power4/G5 - transition package Package: kernel-image-2.6-s390 Architecture: s390 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-s390 Description: Linux kernel 2.6 image on IBM S/390 machines - transition package @@ -255,7 +255,7 @@ Description: Linux kernel 2.6 image on IBM S/390 machines - transition package Package: kernel-image-2.6-s390x Architecture: s390 -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-s390x Description: Linux kernel 2.6 image on IBM zSeries machines - transition package @@ -264,7 +264,7 @@ Description: Linux kernel 2.6 image on IBM zSeries machines - transition package Package: kernel-image-2.6-sparc64 X-Version-Overwrite-Epoch: 1 Architecture: sparc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-sparc64 Description: Linux kernel 2.6 image on uniprocessor 64-bit UltraSPARC class machines - transition package @@ -273,7 +273,7 @@ Description: Linux kernel 2.6 image on uniprocessor 64-bit UltraSPARC class mach Package: kernel-image-2.6-sparc64-smp X-Version-Overwrite-Epoch: 1 Architecture: sparc -Section: base +Section: admin Priority: extra Depends: linux-image-2.6-sparc64-smp Description: Linux kernel 2.6 image on multi-processor 64-bit UltraSPARC class machines - transition package diff --git a/debian/templates/control.image.latest.in b/debian/templates/control.image.latest.in index 5674b3466..4376a5c64 100644 --- a/debian/templates/control.image.latest.in +++ b/debian/templates/control.image.latest.in @@ -1,5 +1,5 @@ Package: linux-image@localversion@ -Section: base +Section: admin Priority: optional Depends: linux-image-@major@@localversion@ (= ${Source-Version}) Description: Linux kernel image on @class@ machines @@ -7,7 +7,7 @@ Description: Linux kernel image on @class@ machines @longclass@ machines. Package: linux-image-@major@@localversion@ -Section: base +Section: admin Priority: optional Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${Source-Version}) Description: Linux kernel @major@ image on @class@ machines diff --git a/debian/templates/control.image.type-modulesextra.in b/debian/templates/control.image.type-modulesextra.in index 33f11c956..04b40cc59 100644 --- a/debian/templates/control.image.type-modulesextra.in +++ b/debian/templates/control.image.type-modulesextra.in @@ -1,5 +1,5 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: base +Section: admin Priority: optional Provides: linux-image, linux-image-@major@ Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${Source-Version}) @@ -9,7 +9,7 @@ Description: Linux kernel @upstreamversion@ image on @class@ machines Linux kernel @upstreamversion@ on @longclass@ machines. Package: linux-modules-@upstreamversion@@abiname@@localversion@ -Section: base +Section: admin Priority: optional Depends: module-init-tools (>= 0.9.13) Description: Linux kernel modules @upstreamversion@ image on @class@ machines diff --git a/debian/templates/control.image.type-modulesinline.in b/debian/templates/control.image.type-modulesinline.in index 96e6ca00f..f52df6d0e 100644 --- a/debian/templates/control.image.type-modulesinline.in +++ b/debian/templates/control.image.type-modulesinline.in @@ -1,5 +1,5 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: base +Section: admin Priority: optional Provides: linux-image, linux-image-@major@ Depends: module-init-tools (>= 0.9.13) diff --git a/debian/templates/control.image.type-standalone.in b/debian/templates/control.image.type-standalone.in index 9f85bb71f..7080e22d3 100644 --- a/debian/templates/control.image.type-standalone.in +++ b/debian/templates/control.image.type-standalone.in @@ -1,5 +1,5 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: base +Section: admin Priority: optional Provides: linux-image, linux-image-@major@ Suggests: linux-doc-@version@ | linux-source-@version@