[kernel] r6301 - in dists/sid/linux-2.6/debian: . modules

[Bastian Blank]

Author: waldi
Date: Tue Mar 28 08:55:00 2006
New Revision: 6301

Modified:
   dists/sid/linux-2.6/debian/modules/gencontrol.py
   dists/sid/linux-2.6/debian/rules.real
Log:
* debian/modules/gencontrol.py: Use unique provides of headers all package.
* debian/rules.real: Make provides of headers all package unique.


Modified: dists/sid/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/modules/gencontrol.py	Tue Mar 28 08:55:00 2006
@@ -13,7 +13,7 @@
 
     def do_main_packages(self, packages):
         l = package_relation_group()
-        l.extend([package_relation('linux-headers-%s%s-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch)) for arch in self.config['base',]['arches']])
+        l.extend([package_relation('linux-headers-%s%s-all-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch)) for arch in self.config['base',]['arches']])
         packages['source']['Build-Depends'].append(l)
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):

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	Tue Mar 28 08:55:00 2006
@@ -310,7 +310,7 @@
 	chmod a+x debian/modules/gencontrol.py
 	dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
 	dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
-	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=linux-headers-$(UPSTREAMVERSION)$(ABINAME)-$(ARCH)'
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)'
 
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION)