* debian/changelog: Update.

* debian/templates: Update sections.

svn path=/dists/trunk/linux-2.6/; revision=13803

debian/changelog

@@ -75,6 +75,7 @@ linux-2.6 (2.6.30-1~experimental.1) UNRELEASED; urgency=low
   * [i386] Allocate pagetables from High Memory.
   * [amd64, i386] Write protect kernel read-only data structures.
   * [amd64, i386] Make kernel relocatable.
+  * Move images and headers into kernel section.
 
   [ dann frazier ]
   * Enable bnx2x, using firmware-split patches from net-next and mirroring

debian/templates/control.headers.arch.in

@@ -1,6 +1,4 @@
 Package: linux-headers-@upstreamversion@@abiname@-all
-Section: devel
-Priority: optional
 Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${binary:Version})
 Description: All header files for Linux @version@
  This package depends against all architecture-specific kernel header files
@@ -8,8 +6,6 @@ Description: All header files for Linux @version@
  kernel modules.
 
 Package: linux-headers-@upstreamversion@@abiname@-all-@arch@
-Section: devel
-Priority: optional
 Description: All header files for Linux @version@
  This package depends against all architecture-specific kernel header files
  for Linux kernel version @upstreamversion@, generally used for building out-of-tree

debian/templates/control.headers.featureset.in

@@ -1,6 +1,4 @@
 Package: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@
-Section: devel
-Priority: optional
 Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@
  This package provides the architecture-specific common kernel header files
  for Linux kernel version @upstreamversion@@abiname@@localversion_headers@, generally used for building out-of-tree

debian/templates/control.headers.in

@@ -1,6 +1,4 @@
 Package: linux-headers-@upstreamversion@@abiname@@localversion@
-Section: devel
-Priority: optional
 Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@
 Provides: linux-headers, linux-headers-@major@
 Description: Header files for Linux @upstreamversion@@abiname@@localversion@

debian/templates/control.image.type-kernel-package.in

@@ -1,6 +1,4 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: optional
 Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
 Depends: module-init-tools

debian/templates/control.image.type-modulesextra.in

@@ -1,6 +1,4 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: optional
 Provides: linux-image, linux-image-@major@
 Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
 Suggests: linux-doc-@version@
@@ -9,8 +7,6 @@ Description: Linux @upstreamversion@ image on @class@
  Linux kernel @upstreamversion@ on @longclass@ machines.
 
 Package: linux-modules-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: optional
 Depends: module-init-tools
 Description: Linux @upstreamversion@ modules on @class@
  This package provides pre-built loadable modules for

debian/templates/control.image.type-modulesinline.in

@@ -1,6 +1,4 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: optional
 Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
 Depends: module-init-tools
 Suggests: linux-doc-@version@

debian/templates/control.image.type-plain.in

@@ -1,6 +1,4 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: optional
 Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
 Depends: module-init-tools, ${shlibs:Depends}

debian/templates/control.image.type-standalone.in

@@ -1,6 +1,4 @@
 Package: linux-image-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: optional
 Provides: linux-image, linux-image-@major@
 Suggests: linux-doc-@version@
 Depends: ${shlibs:Depends}

debian/templates/control.libc-dev.in

@@ -1,6 +1,5 @@
 Package: linux-libc-dev
 Section: devel
-Priority: optional
 Provides: linux-kernel-headers
 Replaces: linux-kernel-headers, libdrm-dev (<= 2.4.5-1)
 Conflicts: linux-kernel-headers

debian/templates/control.main.in

@@ -1,7 +1,6 @@
 Package: linux-source-@version@
 Architecture: all
-Section: devel
-Priority: optional
+Section: kernel
 Provides: linux-source, linux-source-@major@
 Depends: binutils, bzip2
 Recommends: libc6-dev | libc-dev, gcc, make
@@ -21,7 +20,6 @@ Description: Linux kernel source for version @version@ with Debian patches
 Package: linux-doc-@version@
 Architecture: all
 Section: doc
-Priority: optional
 Provides: linux-doc-@major@
 Description: Linux kernel specific documentation for version @version@
  This package provides the various README files and HTML documentation for
@@ -34,7 +32,6 @@ Description: Linux kernel specific documentation for version @version@
 Package: linux-manual-@version@
 Architecture: all
 Section: doc
-Priority: optional
 Provides: linux-manual, kernel-manual-@major@
 Conflicts: linux-manual, kernel-manual-@major@
 Replaces: linux-manual, kernel-manual-@major@
@@ -50,8 +47,6 @@ Description: Linux kernel API manual pages for version @version@
 
 Package: linux-patch-debian-@version@
 Architecture: all
-Section: devel
-Priority: optional
 Depends: bzip2, linux-support-@upstreamversion@@abiname@
 Suggests: linux-source-@version@
 Description: Debian patches to version @version@ of the Linux kernel

debian/templates/control.source.in

@@ -1,4 +1,4 @@
-Section: devel
+Section: kernel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>

debian/templates/control.support.in

@@ -1,7 +1,6 @@
 Package: linux-support-@upstreamversion@@abiname@
 Architecture: all
 Section: devel
-Priority: optional
 Depends: ${python:Depends}
 Description: Support files for Linux @upstreamversion@
  This package provides support files for the Linux kernel build.

debian/templates/control.tree.in

@@ -1,7 +1,6 @@
 Package: linux-tree-@version@
 Architecture: all
 Section: devel
-Priority: optional
 Description: Linux kernel source tree for building Debian kernel images
  This metapackage is used as a build dependency of Debian
  linux-image packages to prevent a version discrepancy between

debian/templates/control.xen-linux-system.in

@@ -1,6 +1,4 @@
 Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
-Section: kernel
-Priority: extra
 Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
 Description: XEN system with Linux @upstreamversion@ image on @class@
  This package depends on the binary Linux image and hypervisors.