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

[Bastian Blank]

Author: waldi
Date: Thu Sep 27 17:25:29 2007
New Revision: 9578

Log:
Move linux-libc-dev definition into own control snippet.

* debian/bin/gencontrol.py: Update.
* debian/templates/control.headers.arch.in: Remove linux-libc-dev.
* debian/templates/control.libc-dev.in: Add.


Added:
   dists/trunk/linux-2.6/debian/templates/control.libc-dev.in
      - copied, changed from r9077, /dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/templates/control.headers.arch.in

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Thu Sep 27 17:25:29 2007
@@ -36,6 +36,9 @@
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
         headers_arch = self.templates["control.headers.arch"]
         packages_headers_arch = self.process_packages(headers_arch, vars)
+
+        libc_dev = self.templates["control.libc-dev"]
+        packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
         
         extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = PackageRelation()
 

Modified: dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.arch.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.arch.in	Thu Sep 27 17:25:29 2007
@@ -1,13 +1,3 @@
-Package: linux-libc-dev
-Section: devel
-Priority: optional
-Provides: linux-kernel-headers
-Replaces: linux-kernel-headers
-Conflicts: linux-kernel-headers
-Description: Linux Kernel Headers for development
- This package provides headers from the Linux kernel.  These headers
- are used by the installed headers for GNU glibc and other system libraries.
-
 Package: linux-headers- at upstreamversion@@abiname at -all
 Section: devel
 Priority: optional

Copied: dists/trunk/linux-2.6/debian/templates/control.libc-dev.in (from r9077, /dists/trunk/linux-2.6/debian/templates/control.headers.arch.in)
==============================================================================
--- /dists/trunk/linux-2.6/debian/templates/control.headers.arch.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Thu Sep 27 17:25:29 2007
@@ -7,23 +7,3 @@
 Description: Linux Kernel Headers for development
  This package provides headers from the Linux kernel.  These headers
  are used by the installed headers for GNU glibc and other system libraries.
-
-Package: linux-headers- at upstreamversion@@abiname at -all
-Section: devel
-Priority: optional
-Provides: linux-headers- at major@-all, linux-headers- at version@-all
-Depends: linux-headers- at upstreamversion@@abiname at -all-${kernel:Arch} (= ${Source-Version})
-Description: All header files for Linux @version@
- This package depends against all architecture-specific kernel header files
- for Linux kernel version @upstreamversion@, generally used for building out-of-tree
- kernel modules.
-
-Package: linux-headers- at upstreamversion@@abiname at -all-@arch@
-Section: devel
-Priority: optional
-Provides: linux-headers- at major@-all- at arch@, linux-headers- at version@-all- at arch@
-Description: All header files for Linux @version@
- This package depends against all architecture-specific kernel header files
- for Linux kernel version @upstreamversion@, generally used for building out-of-tree
- kernel modules.
-