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

[Bastian Blank]

Author: waldi
Date: Sun Apr  2 20:22:53 2006
New Revision: 6361

Added:
   dists/trunk/linux-2.6/debian/templates/control.support.in
Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
Log:
Merge /dists/sid/linux-2.6.


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	Sun Apr  2 20:22:53 2006
@@ -21,11 +21,13 @@
         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[2]['Depends']
+        
+        extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends'] = package_relation_list()
 
-        for package in packages_headers_arch:
+        for package in packages_support + packages_headers_arch:
             name = package['Package']
             if packages.has_key(name):
                 package = packages.get(name)

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Apr  2 20:22:53 2006
@@ -8,6 +8,9 @@
 
   [ Bastian Blank ]
   * Provide real dependency packages for module building.
+    - Add linux-headers-$version-$abiname-all and
+      linux-headers-$version-$abiname-all-$arch.
+  * Rename support package to linux-support-$version-$abiname.
   * Fix module package output.
   * Include .kernelrelease in headers packages. (closes: #359813)
   * Disable Cumana partition support completely. (closes: #359207)
@@ -15,7 +18,7 @@
   [ dann frazier ]
   * [ia64] initramfs-tools works now, no longer restrict initramfs-generators
 
- -- dann frazier <dannf at debian.org>  Thu, 30 Mar 2006 15:45:35 -0700
+ -- Bastian Blank <waldi at debian.org>  Sun,  2 Apr 2006 16:21:29 +0200
 
 linux-2.6 (2.6.16-4) unstable; urgency=medium
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Sun Apr  2 20:22:53 2006
@@ -66,7 +66,7 @@
 #
 # Targets
 #
-binary-arch-arch: install-headers-all install-headers-$(ARCH)
+binary-arch-arch: install-support install-headers-$(ARCH)
 binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
 binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
 ifeq ($(MODULES),True)
@@ -317,14 +317,14 @@
 
 	$(MAKE) -f debian/rules.real install-base
 
-install-headers-all: PACKAGE_NAME = linux-headers-$(VERSION)
-install-headers-all: DH_OPTIONS = -p$(PACKAGE_NAME)
-install-headers-all:
+install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)
+install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-support:
 	dh_testdir
 	dh_testroot
 	chmod a+x debian/modules/gencontrol.py
-	dh_install debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)'
-	dh_python -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python
+	dh_install debian/arch debian/lib debian/modules /usr/src/$(PACKAGE_NAME)
+	dh_python -V 2.4 /usr/src/$(PACKAGE_NAME)/lib/python
 	$(MAKE) -f debian/rules.real install-base
 
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)

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	Sun Apr  2 20:22:53 2006
@@ -1,12 +1,3 @@
-Package: linux-headers- at version@
-Section: devel
-Priority: optional
-Depends: python2.4-minimal
-Description: All header files for Linux kernel @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
 Section: devel
 Priority: optional
@@ -21,7 +12,6 @@
 Section: devel
 Priority: optional
 Provides: linux-headers- at major@-all- at arch@, linux-headers- at version@-all- at arch@
-Depends: linux-headers- at version@ (= ${Source-Version})
 Description: All header files for Linux kernel @version@
  This package depends against all architecture-specific kernel header files
  for Linux kernel version @upstreamversion@, generally used for building out-of-tree

Added: dists/trunk/linux-2.6/debian/templates/control.support.in
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/templates/control.support.in	Sun Apr  2 20:22:53 2006
@@ -0,0 +1,7 @@
+Package: linux-support- at upstreamversion@@abiname@
+Section: devel
+Priority: optional
+Depends: python2.4-minimal
+Description: Support files for Linux kernel @upstreamversion@
+ This package provides support files for the Linux kernel build.
+