[kernel] r6338 - in dists/trunk/linux-2.6: . debian

[Bastian Blank]

Author: waldi
Date: Wed Mar 29 22:18:18 2006
New Revision: 6338

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar 29 22:18:18 2006
@@ -4,6 +4,15 @@
 
  -- Bastian Blank <waldi at debian.org>  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 <waldi at debian.org>  Thu, 30 Mar 2006 00:08:39 +0200
+
 linux-2.6 (2.6.16-4) unstable; urgency=medium
 
   [ Martin Michlmayr ]

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Wed Mar 29 22:18:18 2006
@@ -264,9 +264,7 @@
 
 	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 \