From 28740c47268e54492f8f3699801200b6a3db2f30 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 29 Mar 2006 22:18:18 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6338 --- debian/changelog | 9 +++++++++ debian/rules.real | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6bc4c7fc1..afbd7fb0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,15 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low -- Bastian Blank Thu, 23 Mar 2006 21:40:17 +0100 +linux-2.6 (2.6.16-5) UNRELEASED; urgency=low + + [ Bastian Blank ] + * Provide real dependency packages for module building. + * Fix module package output. + * Include .kernelrelease in headers packages. (closes: #359813) + + -- Bastian Blank Thu, 30 Mar 2006 00:08:39 +0200 + linux-2.6 (2.6.16-4) unstable; urgency=medium [ Martin Michlmayr ] diff --git a/debian/rules.real b/debian/rules.real index 20a7d9afc..055aa7cd1 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -264,9 +264,7 @@ install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBA mkdir -p "${DIR}/arch/${KERNEL_ARCH}/kernel" mkdir -p "${DIR}/include" - cp -a ${SOURCE_DIR}/{.config,Module.symvers} "${DIR}" - # TODO - echo $(ABINAME)$(LOCALVERSION) > "${DIR}/localversion" + cp -a ${SOURCE_DIR}/{.config,.kernelrelease,Module.symvers} "${DIR}" cd ${SOURCE_DIR}; \ find . -mindepth 1 -maxdepth 1 \