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

[Ben Hutchings]

Author: benh
Date: Thu Dec 17 05:28:39 2009
New Revision: 14794

Log:
Update to 2.6.32-trunk.

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

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Thu Dec 17 05:09:55 2009	(r14793)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Thu Dec 17 05:28:39 2009	(r14794)
@@ -33,8 +33,12 @@
 
     def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         config_base = self.config.merge('base', arch, featureset, flavour)
+        config_description = self.config.merge('description', arch, featureset, flavour)
         config_image = self.config.merge('image', arch, featureset, flavour)
 
+        vars['class'] = config_description['hardware']
+        vars['longclass'] = config_description.get('hardware-long') or vars['class']
+
         templates = []
 
         if config_image.get('type', None) == 'plain-xen':
@@ -46,12 +50,12 @@
 
         image_fields = {'Description': PackageDescription()}
 
-        desc_parts = self.config.get_merge('image', arch, featureset, flavour, 'desc-parts')
+        desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')
         if desc_parts:
             desc = image_fields['Description']
             for part in desc_parts[::-1]:
-                desc.append(config_image['desc-long-part-' + part])
-                desc.append_short(config_image.get('desc-short-part-' + part, ''))
+                desc.append(config_description['part-long-' + part])
+                desc.append_short(config_description.get('part-short-' + part, ''))
 
         packages_dummy = []
 

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Thu Dec 17 05:09:55 2009	(r14793)
+++ dists/sid/linux-latest-2.6/debian/changelog	Thu Dec 17 05:28:39 2009	(r14794)
@@ -1,3 +1,9 @@
+linux-latest-2.6 (23) UNRELEASED; urgency=low
+
+  * Update to 2.6.32-trunk.
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 17 Dec 2009 03:31:19 +0000
+
 linux-latest-2.6 (22) unstable; urgency=low
 
   * Update to 2.6.31-1.

Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.defs	Thu Dec 17 05:09:55 2009	(r14793)
+++ dists/sid/linux-latest-2.6/debian/rules.defs	Thu Dec 17 05:28:39 2009	(r14794)
@@ -1 +1 @@
-KERNELVERSION := 2.6.31-1
+KERNELVERSION := 2.6.32-trunk