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

[Ben Hutchings]

Author: benh
Date: Fri Oct  1 02:34:26 2010
New Revision: 16382

Log:
Fix repetition in description of linux-image-2.6-xen-amd64 (Closes: #598648)

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	Thu Sep 30 11:32:46 2010	(r16381)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Fri Oct  1 02:34:26 2010	(r16382)
@@ -66,8 +66,11 @@
 
         desc_parts = self.config.get_merge('description', arch, featureset, flavour, 'parts')
         if desc_parts:
+            # XXX: Workaround, we need to support multiple entries of the same name
+            parts = list(set(desc_parts))
+            parts.sort()
             desc = image_fields['Description']
-            for part in desc_parts[::-1]:
+            for part in parts:
                 desc.append(config_description['part-long-' + part])
                 desc.append_short(config_description.get('part-short-' + part, ''))
 

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Thu Sep 30 11:32:46 2010	(r16381)
+++ dists/sid/linux-latest-2.6/debian/changelog	Fri Oct  1 02:34:26 2010	(r16382)
@@ -3,6 +3,8 @@
   * Add xen-linux-system-2.6-* meta-packages (Closes: #402414)
   * Add bug presubj message for image meta packages directing users to the
     real image packages (Closes: #549591)
+  * Fix repetition in description of linux-image-2.6-xen-amd64
+    (Closes: #598648)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 01 Aug 2010 23:24:48 +0100