[kernel] r12447 - in dists/sid/linux-latest-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Mon Nov 24 14:20:56 2008
New Revision: 12447

Log:
* debian/bin/gencontrol.py: Extend descriptions.
* debian/changelog: Update.


Modified:
   dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
   dists/sid/linux-latest-2.6/debian/changelog

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Mon Nov 24 14:20:56 2008
@@ -4,7 +4,7 @@
 sys.path.append(sys.argv[1] + "/lib/python")
 
 from debian_linux.config import ConfigCoreDump
-from debian_linux.debian import Changelog, VersionLinux
+from debian_linux.debian import Changelog, PackageDescription, VersionLinux
 from debian_linux.gencontrol import Gencontrol as Base
 from debian_linux.utils import Templates
 
@@ -44,7 +44,19 @@
         if config_base.get('modules', True):
             templates.extend(self.templates["control.headers.latest"])
 
-        packages_dummy = self.process_packages(templates, vars)
+        image_fields = {'Description': PackageDescription()}
+
+        if 'desc-parts' in config_image:
+            desc = image_fields['Description']
+            parts = config_image['desc-parts']
+            for part in parts:
+                desc.append(config_image['desc-long-part-' + part])
+                desc.append_short(config_image.get('desc-short-part-' + part, ''))
+
+        packages_dummy = []
+
+        packages_dummy.append(self.process_real_image(templates[0], image_fields, vars))
+        packages_dummy.extend(self.process_packages(templates[1:], vars))
 
         for package in packages_dummy:
             name = package['Package']
@@ -84,5 +96,15 @@
             makefile.add('binary-arch_%s' % arch, ['binary-arch_%s_extra' % arch])
             makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
 
+    def process_real_image(self, entry, fields, vars):
+        entry = self.process_package(entry, vars)
+        for key, value in fields.iteritems():
+            if key in entry:
+                real = entry[key]
+                real.extend(value)
+            elif value:
+                entry[key] = value
+        return entry
+
 if __name__ == '__main__':
     Gencontrol(sys.argv[1] + "/config.defines.dump")()

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	(original)
+++ dists/sid/linux-latest-2.6/debian/changelog	Mon Nov 24 14:20:56 2008
@@ -1,6 +1,7 @@
 linux-latest-2.6 (17) UNRELEASED; urgency=low
 
   * Use correct part of the config for image type.
+  * Add description parts.
 
  -- Bastian Blank <waldi at debian.org>  Mon, 24 Nov 2008 14:14:10 +0100