[kernel] r5280 - in people/waldi/linux-2.6/debian: arch arch/hppa lib/python/debian_linux templates

[Bastian Blank]

Author: waldi
Date: Thu Jan  5 14:24:08 2006
New Revision: 5280

Modified:
   people/waldi/linux-2.6/debian/arch/defines
   people/waldi/linux-2.6/debian/arch/hppa/defines
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   people/waldi/linux-2.6/debian/templates/control.source.in
Log:
* debian/arch/defines, debian/arch/hppa/defines: Set relations for compiler.
* debian/lib/python/debian_linux/gencontrol.py: Set compiler build dependencies
  from config informations.
* debian/templates/control.source.in: Remove compiler from Build-Depends.


Modified: people/waldi/linux-2.6/debian/arch/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/defines	Thu Jan  5 14:24:08 2006
@@ -28,3 +28,7 @@
 yaird: mkinitrd.yaird
 initramfs-tools: mkinitramfs
 
+[relations]
+gcc: gcc (>= 4:4.0)
+gcc-3.3: gcc-3.3
+

Modified: people/waldi/linux-2.6/debian/arch/hppa/defines
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/defines	(original)
+++ people/waldi/linux-2.6/debian/arch/hppa/defines	Thu Jan  5 14:24:08 2006
@@ -20,3 +20,6 @@
 [parisc64-smp]
 class: multi-processor 64-bit PA-RISC
 
+[relations]
+gcc: gcc (>= 4:4.0), binutils-hppa64, gcc-4.0-hppa64
+

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Jan  5 14:24:08 2006
@@ -155,6 +155,15 @@
         if not vars.has_key('longclass'):
             vars['longclass'] = vars['class']
 
+        config_base = self.config.merge('base', arch)
+        config_relations = self.config.merge('relations', arch)
+        compiler = config_base.get('compiler', 'gcc')
+        relations_compiler = package_relation_list(config_relations[compiler])
+        for group in relations_compiler:
+            for item in group:
+                item.arches = [arch]
+        packages['source']['Build-Depends'].extend(relations_compiler)
+
         makeflags['FLAVOUR'] = flavour
         self.do_flavour_makeflags(makeflags, arch, subarch, flavour)
         self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)

Modified: people/waldi/linux-2.6/debian/templates/control.source.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.source.in	(original)
+++ people/waldi/linux-2.6/debian/templates/control.source.in	Thu Jan  5 14:24:08 2006
@@ -4,5 +4,5 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>, Simon Horman <horms at debian.org>, Sven Luther <luther at debian.org>, Jonas Smedegaard <dr at jones.dk>, Norbert Tretkowski <nobse at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!m68k], gcc-3.3 [m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.029), ocaml-interp, python2.4-minimal
+Build-Depends: debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.029), ocaml-interp, python2.4-minimal
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto