[kernel] r6401 - in dists/sid/linux-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: Tue Apr 11 22:03:50 2006
New Revision: 6401

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/rules.real
   dists/sid/linux-2.6/debian/templates/control.support.in
Log:
Merge r6362 from /dists/trunk/linux-2.6.


Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Tue Apr 11 22:03:50 2006
@@ -22,17 +22,18 @@
         tree = self.templates["control.tree"]
         packages.append(self.process_real_tree(tree[0], vars))
 
+        packages.extend(self.process_packages(self.templates["control.support"], vars))
+
     def do_arch_setup(self, vars, makeflags, arch):
         vars.update(self.config.get(('image', arch), {}))
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
-        packages_support = self.process_packages(self.templates["control.support"], vars)
         headers_arch = self.templates["control.headers.arch"]
         packages_headers_arch = self.process_packages(headers_arch, vars)
         
         extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = package_relation_list()
 
-        for package in packages_support + packages_headers_arch:
+        for package in packages_headers_arch:
             name = package['Package']
             if packages.has_key(name):
                 package = packages.get(name)

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 Apr 11 22:03:50 2006
@@ -66,11 +66,12 @@
 #
 # Targets
 #
-binary-arch-arch: install-support install-headers-$(ARCH)
+binary-arch-arch: install-headers-$(ARCH)
 binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
 binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 
 binary-indep: install-doc install-patch install-source install-tree
+binary-indep: install-support
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
 

Modified: dists/sid/linux-2.6/debian/templates/control.support.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.support.in	(original)
+++ dists/sid/linux-2.6/debian/templates/control.support.in	Tue Apr 11 22:03:50 2006
@@ -1,4 +1,5 @@
 Package: linux-support- at upstreamversion@@abiname@
+Architecture: all
 Section: devel
 Priority: optional
 Depends: python2.4-minimal