From b03ee7266119dc857d2f87087557306d23f04d98 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Tue, 8 Sep 2009 17:55:12 +0200 Subject: prepare 2.6.29-rt1-1 --- templates/control.headers.arch.in | 4 ++-- templates/control.headers.featureset.in | 2 +- templates/control.headers.in | 4 ++-- templates/control.image.type-kernel-package.in | 4 ++-- templates/control.image.type-modulesextra.in | 6 +++--- templates/control.image.type-modulesinline.in | 4 ++-- templates/control.image.type-plain.in | 4 ++-- templates/control.image.type-standalone.in | 4 ++-- templates/control.libc-dev.in | 2 +- templates/control.main.in | 10 +++++----- templates/control.source.in | 7 ++++--- templates/control.support.in | 2 +- templates/control.tree.in | 2 +- templates/control.xen-linux-system.in | 2 +- 14 files changed, 29 insertions(+), 28 deletions(-) (limited to 'templates') diff --git a/templates/control.headers.arch.in b/templates/control.headers.arch.in index a9d5b81..3197830 100644 --- a/templates/control.headers.arch.in +++ b/templates/control.headers.arch.in @@ -1,5 +1,5 @@ Package: linux-headers-@upstreamversion@@abiname@-all -Section: devel +Section: non-free/devel Priority: optional Depends: linux-headers-@upstreamversion@@abiname@-all-${kernel:Arch} (= ${binary:Version}) Description: All header files for Linux @version@ @@ -8,7 +8,7 @@ Description: All header files for Linux @version@ kernel modules. Package: linux-headers-@upstreamversion@@abiname@-all-@arch@ -Section: devel +Section: non-free/devel Priority: optional Description: All header files for Linux @version@ This package depends against all architecture-specific kernel header files diff --git a/templates/control.headers.featureset.in b/templates/control.headers.featureset.in index af137b4..dbe0c06 100644 --- a/templates/control.headers.featureset.in +++ b/templates/control.headers.featureset.in @@ -1,5 +1,5 @@ Package: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ -Section: devel +Section: non-free/devel Priority: optional Description: Common header files for Linux @upstreamversion@@abiname@@localversion_headers@ This package provides the architecture-specific common kernel header files diff --git a/templates/control.headers.in b/templates/control.headers.in index 50867e9..9d2eb40 100644 --- a/templates/control.headers.in +++ b/templates/control.headers.in @@ -1,8 +1,8 @@ Package: linux-headers-@upstreamversion@@abiname@@localversion@ -Section: devel +Section: non-free/devel Priority: optional Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${binary:Version}), linux-kbuild-@version@ -Provides: linux-headers, linux-headers-@major@ +Provides: linux-headers, linux-headers-@major@, linux-headers-rt, linux-headers-@major@-rt Description: Header files for Linux @upstreamversion@@abiname@@localversion@ This package provides the architecture-specific kernel header files for Linux kernel @upstreamversion@@abiname@@localversion@, generally diff --git a/templates/control.image.type-kernel-package.in b/templates/control.image.type-kernel-package.in index e2325e4..27f5846 100644 --- a/templates/control.image.type-kernel-package.in +++ b/templates/control.image.type-kernel-package.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: optional -Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ +Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@, linux-image-@major@-rt Pre-Depends: debconf | debconf-2.0 Depends: module-init-tools Suggests: linux-doc-@version@ diff --git a/templates/control.image.type-modulesextra.in b/templates/control.image.type-modulesextra.in index a171e5a..5e903ba 100644 --- a/templates/control.image.type-modulesextra.in +++ b/templates/control.image.type-modulesextra.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: optional -Provides: linux-image, linux-image-@major@ +Provides: linux-image, linux-image-@major@, linux-image-@major@-rt Depends: linux-modules-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}) Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ image on @class@ @@ -9,7 +9,7 @@ Description: Linux @upstreamversion@ image on @class@ Linux kernel @upstreamversion@ on @longclass@ machines. Package: linux-modules-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: optional Depends: module-init-tools Description: Linux @upstreamversion@ modules on @class@ diff --git a/templates/control.image.type-modulesinline.in b/templates/control.image.type-modulesinline.in index 5c8e03d..2dcf552 100644 --- a/templates/control.image.type-modulesinline.in +++ b/templates/control.image.type-modulesinline.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: optional -Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ +Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@, linux-image-@major@-rt Depends: module-init-tools Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ image on @class@ diff --git a/templates/control.image.type-plain.in b/templates/control.image.type-plain.in index 03ae343..d91b172 100644 --- a/templates/control.image.type-plain.in +++ b/templates/control.image.type-plain.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: optional -Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ +Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@, linux-image-@major@-rt Pre-Depends: debconf | debconf-2.0 Depends: module-init-tools, ${shlibs:Depends} Suggests: linux-doc-@version@ diff --git a/templates/control.image.type-standalone.in b/templates/control.image.type-standalone.in index 20d74e4..c6e78ba 100644 --- a/templates/control.image.type-standalone.in +++ b/templates/control.image.type-standalone.in @@ -1,7 +1,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: optional -Provides: linux-image, linux-image-@major@ +Provides: linux-image, linux-image-@major@, linux-image-@major@-rt Suggests: linux-doc-@version@ Depends: ${shlibs:Depends} Description: Linux @upstreamversion@ image on @class@ diff --git a/templates/control.libc-dev.in b/templates/control.libc-dev.in index 2f9b0aa..b2be30e 100644 --- a/templates/control.libc-dev.in +++ b/templates/control.libc-dev.in @@ -1,5 +1,5 @@ Package: linux-libc-dev -Section: devel +Section: non-free/devel Priority: optional Provides: linux-kernel-headers Replaces: linux-kernel-headers, libdrm-dev (<= 2.4.5-1) diff --git a/templates/control.main.in b/templates/control.main.in index d5488e9..6e7c6b7 100644 --- a/templates/control.main.in +++ b/templates/control.main.in @@ -1,8 +1,8 @@ Package: linux-source-@version@ Architecture: all -Section: devel +Section: non-free/devel Priority: optional -Provides: linux-source, linux-source-@major@ +Provides: linux-source, linux-source-@major@, linux-source-@major@-rt Depends: binutils, bzip2 Recommends: libc6-dev | libc-dev, gcc, make Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev @@ -20,7 +20,7 @@ Description: Linux kernel source for version @version@ with Debian patches Package: linux-doc-@version@ Architecture: all -Section: doc +Section: non-free/doc Priority: optional Provides: linux-doc-@major@ Description: Linux kernel specific documentation for version @version@ @@ -33,7 +33,7 @@ Description: Linux kernel specific documentation for version @version@ Package: linux-manual-@version@ Architecture: all -Section: doc +Section: non-free/doc Priority: optional Provides: linux-manual, kernel-manual-@major@ Conflicts: linux-manual, kernel-manual-@major@ @@ -50,7 +50,7 @@ Description: Linux kernel API manual pages for version @version@ Package: linux-patch-debian-@version@ Architecture: all -Section: devel +Section: non-free/devel Priority: optional Depends: bzip2, linux-support-@upstreamversion@@abiname@ Suggests: linux-source-@version@ diff --git a/templates/control.source.in b/templates/control.source.in index 1c53bc4..e46d813 100644 --- a/templates/control.source.in +++ b/templates/control.source.in @@ -1,8 +1,9 @@ -Section: devel +Section: non-free/devel Priority: optional -Maintainer: Debian Kernel Team -Uploaders: Bastian Blank , Frederik Schüler , maximilian attems +Maintainer: Uwe Kleine-König Standards-Version: 3.8.0 Build-Depends: debhelper, module-init-tools, dpkg-dev (>= 1.10.23), sparc-utils [sparc], kernel-package (>= 10.063), python Build-Depends-Indep: bzip2, findutils (>= 4.2.12), python-central, xmlto XS-Python-Version: current +Origin: pengutronix.de +Bugs: mailto:kernel@pengutronix.de diff --git a/templates/control.support.in b/templates/control.support.in index 188ffe2..9db9775 100644 --- a/templates/control.support.in +++ b/templates/control.support.in @@ -1,6 +1,6 @@ Package: linux-support-@upstreamversion@@abiname@ Architecture: all -Section: devel +Section: non-free/devel Priority: optional Depends: ${python:Depends} Description: Support files for Linux @upstreamversion@ diff --git a/templates/control.tree.in b/templates/control.tree.in index cde1370..f5f3e58 100644 --- a/templates/control.tree.in +++ b/templates/control.tree.in @@ -1,6 +1,6 @@ Package: linux-tree-@version@ Architecture: all -Section: devel +Section: non-free/devel Priority: optional Description: Linux kernel source tree for building Debian kernel images This metapackage is used as a build dependency of Debian diff --git a/templates/control.xen-linux-system.in b/templates/control.xen-linux-system.in index a57721c..b691c3c 100644 --- a/templates/control.xen-linux-system.in +++ b/templates/control.xen-linux-system.in @@ -1,5 +1,5 @@ Package: xen-linux-system-@upstreamversion@@abiname@@localversion@ -Section: admin +Section: non-free/admin Priority: extra Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version}) Description: XEN system with Linux @upstreamversion@ image on @class@ -- cgit v1.2.3