[kernel] r6508 - dists/sid/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Sun Apr 30 17:51:37 2006
New Revision: 6508

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/rules.real
Log:
* debian/changelog: Update.
* debian/rules.real: Use localversion for kernel-package images.
Closes: 365505


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Apr 30 17:51:37 2006
@@ -5,8 +5,9 @@
   * Conflict with known broken grub versions. (closes: #361308)
   * Enable s390 vserver image. 
   * Enable xen and xen-vserver images.
+  * Use localversion for kernel-package images. (closes: #365505)
 
- -- Bastian Blank <waldi at debian.org>  Sat, 29 Apr 2006 21:09:37 +0200
+ -- Bastian Blank <waldi at debian.org>  Sun, 30 Apr 2006 19:50:52 +0200
 
 linux-2.6 (2.6.16-10) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	(original)
+++ dists/sid/linux-2.6/debian/rules.real	Sun Apr 30 17:51:37 2006
@@ -34,7 +34,7 @@
 # in Makefile.inc. @flavour@ in the expressions is going to be
 # replaced by the flavour for which the command is run. 
 #
-kpkg_image := make-kpkg --append-to-version '$(ABINAME)$(LOCALVERSION)'
+kpkg_image := make-kpkg
 kpkg_image += --arch '$(ARCH)'
 kpkg_image += --stem linux
 ifneq ($(INITRAMFS),False)
@@ -150,6 +150,7 @@
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cp '$<' '$(DIR)/.config'
+	echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
 	cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
 	touch '$@'