From eec85fb83313abe446e6513816c5b638f44e96f4 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 2 Apr 2006 20:43:04 +0000
Subject: [PATCH] * debian/bin/gencontrol.py: Support support to main packages.
 * debian/rules.real: Build support package in binary-indep. *
 debian/templates/control.support.in: Set Architecture to all.

svn path=/dists/trunk/linux-2.6/; revision=6362
---
 debian/bin/gencontrol.py            | 5 +++--
 debian/rules.real                   | 3 ++-
 debian/templates/control.support.in | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 3848438ee..454d579c3 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -17,17 +17,18 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
         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)
diff --git a/debian/rules.real b/debian/rules.real
index 4c799ac9b..9fce54b8f 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -66,7 +66,7 @@ endif
 #
 # 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)
 ifeq ($(MODULES),True)
@@ -74,6 +74,7 @@ ifeq ($(MODULES),True)
 endif
 
 binary-indep: install-doc install-patch install-source install-tree
+binary-indep: install-support
 
 build: $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
 
diff --git a/debian/templates/control.support.in b/debian/templates/control.support.in
index c3a04f630..4a2d7d7a7 100644
--- a/debian/templates/control.support.in
+++ b/debian/templates/control.support.in
@@ -1,4 +1,5 @@
 Package: linux-support-@upstreamversion@@abiname@
+Architecture: all
 Section: devel
 Priority: optional
 Depends: python2.4-minimal