r4032 - in people/waldi/kernel/linux-2.6/debian: bin templates

[Bastian Blank]

Author: waldi
Date: 2005-08-23 17:31:34 +0000 (Tue, 23 Aug 2005)
New Revision: 4032

Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.in
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.latest.in
   people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in
   people/waldi/kernel/linux-2.6/debian/templates/control.image.in
   people/waldi/kernel/linux-2.6/debian/templates/control.image.latest.in
Log:
* debian/bin/gencontrol.py: Set Architecture for each package.
* debian/templates/control.headers.in, debian/templates/control.headers.latest.in,
  debian/templates/control.headers.subarch.in, debian/templates/control.image.in,
  debian/templates/control.image.latest.in: Remove Architecture field.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 17:18:37 UTC (rev 4031)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 17:31:34 UTC (rev 4032)
@@ -235,10 +235,12 @@
                 f.write("\t%s\n" % j)
 
 def write_rfc822(f, list):
-    for i in list:
-        for j in i.iteritems():
-            f.write("%s:" % j[0])
-            for k in j[1].split('\n'):
+    for entry in list:
+        for key, value in entry.iteritems():
+            f.write("%s:" % key)
+            if isinstance(value, tuple):
+                value = value[0].join(value[1])
+            for k in value.split('\n'):
               f.write(" %s\n" % k)
         f.write('\n')
 
@@ -279,13 +281,22 @@
     image_latest = read_template("image.latest")
     headers_latest = read_template("headers.latest")
 
-    dummy_packages = []
-    packages.append(process_real_image(image[0], vars))
-    packages.append(process_package(headers[0], vars))
-    dummy_packages.extend(process_packages(image_latest, vars))
-    dummy_packages.append(process_package(headers_latest[0], vars))
-    packages.extend(dummy_packages)
+    packages_own = []
+    packages_dummy = []
+    packages_own.append(process_real_image(image[0], vars))
+    packages_own.append(process_package(headers[0], vars))
+    packages_dummy.extend(process_packages(image_latest, vars))
+    packages_dummy.append(process_package(headers_latest[0], vars))
 
+    for package in packages_own + packages_dummy:
+        name = package['Package']
+        if packages.has_key(name):
+            package = packages.get(name)
+            package['Architecture'][1].append(arch)
+        else:
+            package['Architecture'] = (' ', [arch])
+            packages.append(package)
+
     for i in ('binary-arch', 'build', 'setup'):
         makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour), None))
         makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
@@ -297,7 +308,7 @@
 
     cmds_binary_arch = []
     cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
-    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
+    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
     cmds_build = []
     cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
     cmds_setup = []

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.headers.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.headers.in	2005-08-23 17:18:37 UTC (rev 4031)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.in	2005-08-23 17:31:34 UTC (rev 4032)
@@ -1,5 +1,4 @@
 Package: linux-headers- at subarch@@version at -@abiname at -@flavour@
-Architecture: @arch@
 Section: devel
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), linux-headers- at subarch@@version at -@abiname@ (= ${Source-Version})

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.headers.latest.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.headers.latest.in	2005-08-23 17:18:37 UTC (rev 4031)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.latest.in	2005-08-23 17:31:34 UTC (rev 4032)
@@ -1,5 +1,4 @@
 Package: linux-headers- at subarch@@major at -@flavour@
-Architecture: @arch@
 Section: devel
 Priority: optional
 Depends: linux-headers- at subarch@@version at -@abiname at -@flavour@

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in	2005-08-23 17:18:37 UTC (rev 4031)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.headers.subarch.in	2005-08-23 17:31:34 UTC (rev 4032)
@@ -1,5 +1,4 @@
 Package: linux-headers- at subarch@@version at -@abiname@
-Architecture: @arch@
 Section: devel
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0)

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.image.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.image.in	2005-08-23 17:18:37 UTC (rev 4031)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.image.in	2005-08-23 17:31:34 UTC (rev 4032)
@@ -1,5 +1,4 @@
 Package: linux-image- at subarch@@version at -@abiname at -@flavour@
-Architecture: @arch@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@

Modified: people/waldi/kernel/linux-2.6/debian/templates/control.image.latest.in
===================================================================
--- people/waldi/kernel/linux-2.6/debian/templates/control.image.latest.in	2005-08-23 17:18:37 UTC (rev 4031)
+++ people/waldi/kernel/linux-2.6/debian/templates/control.image.latest.in	2005-08-23 17:31:34 UTC (rev 4032)
@@ -1,5 +1,4 @@
 Package: linux-image- at subarch@@flavour@
-Architecture: @arch@
 Section: base
 Priority: optional
 Depends: linux-image- at subarch@@major at -@flavour@
@@ -8,7 +7,6 @@
  @longclass@ machines.
 
 Package: linux-image- at subarch@@major at -@flavour@
-Architecture: @arch@
 Section: base
 Priority: optional
 Depends: linux-image- at subarch@@version at -@abiname at -@flavour@