[kernel] r5540 - in people/waldi/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Sat Jan 21 11:56:20 2006
New Revision: 5540

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Set version on dependencies of headers-all package.
* debian/rules.real
  - Fix headers package name.
  - Install debian/modules into headers-all package.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sat Jan 21 11:56:20 2006
@@ -40,7 +40,7 @@
         # Append this here so it only occurs on the install-headers-all line
 #        makeflags_string += " FLAVOURS='%s' " % ' '.join(['%s' % i for i in config_entry['flavours']])
         cmds_binary_arch = []
-        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(extra['headers_arch_depends']), makeflags_string),))
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(["%s (= %s)" % (i, self.version['source']) for i in extra['headers_arch_depends']]), makeflags_string),))
         makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
 
     def do_subarch_makeflags(self, makeflags, arch, subarch):

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Sat Jan 21 11:56:20 2006
@@ -193,7 +193,7 @@
 	done
 	rm -rf '$(DIR)'
 
-install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(VERSION)$(KPKG_ABINAME)$(LOCALVERSION_HEADERS)
+install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(VERSION)-$(ABINAME)$(LOCALVERSION_HEADERS)
 install-header-$(ARCH)-$(SUBARCH): export DH_OPTIONS = -p$(PACKAGE_NAME)
 install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
 install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
@@ -225,9 +225,7 @@
 install-headers-all:
 	dh_testdir
 	dh_testroot
-	dh_install $(DH_OPTIONS) debian/bin/gencontrol-modules.py '/usr/src/linux-headers-$(VERSION)/bin'
-	dh_install $(DH_OPTIONS) debian/arch '/usr/src/linux-headers-$(VERSION)'
-	dh_install $(DH_OPTIONS) debian/lib '/usr/src/linux-headers-$(VERSION)'
+	dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
 	dh_installdocs $(DH_OPTIONS)
 	dh_installchangelogs $(DH_OPTIONS)
 	dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python