[kernel] r14697 - in dists/trunk/linux-2.6/debian: bin templates

[Bastian Blank]

Author: waldi
Date: Sat Nov 28 14:43:28 2009
New Revision: 14697

Log:
* debian/bin/gencontrol.py: Don't use control.support template.
* debian/templates/control.main.in:
  Merge contents of debian/templates/control.support.in.

Deleted:
   dists/trunk/linux-2.6/debian/templates/control.support.in
Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/templates/control.main.in

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Nov 28 14:40:51 2009	(r14696)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Nov 28 14:43:28 2009	(r14697)
@@ -27,7 +27,6 @@
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages.extend(self.process_packages(self.templates["control.main"], self.vars))
         packages.append(self.process_real_tree(self.templates["control.tree"][0], self.vars))
-        packages.extend(self.process_packages(self.templates["control.support"], self.vars))
 
     def do_arch_setup(self, vars, makeflags, arch, extra):
         config_base = self.config.merge('base', arch)

Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	Sat Nov 28 14:40:51 2009	(r14696)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Sat Nov 28 14:43:28 2009	(r14697)
@@ -67,3 +67,13 @@
  .
  Most firmware previously included in the Linux kernel is non-free
  and has been moved to the firmware-linux-nonfree package.
+
+Package: linux-support- at upstreamversion@@abiname@
+Architecture: all
+Section: devel
+Depends: ${python:Depends}
+Description: Support files for Linux @upstreamversion@
+ This package provides support files for the Linux kernel build,
+ e.g. scripts to handle ABI information and for generation of
+ build system meta data.
+