[kernel] r14705 - in dists/trunk/firmware-nonfree/debian: . bin

[Ben Hutchings]

Author: benh
Date: Tue Dec  1 01:16:12 2009
New Revision: 14705

Log:
Include names of all firmware files in package descriptions (Closes: #553710).
Do not include 'version unknown' in package descriptions.

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Tue Dec  1 01:01:52 2009	(r14704)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Tue Dec  1 01:16:12 2009	(r14705)
@@ -233,10 +233,15 @@
         for f in config_entry['files']:
             f, f_real, version = files_real[f]
             c = self.config.get(('base', package, f), {})
-            desc = c.get('desc', f)
+            desc = c.get('desc')
             if version is None:
-                version = c.get('version', 'unknown')
-            files_desc.append(" * %s, version %s" % (desc, version))
+                version = c.get('version')
+            if desc and version:
+                files_desc.append(" * %s, version %s (%s)" % (desc, version, f))
+            elif desc:
+                files_desc.append(" * %s (%s)" % (desc, f))
+            else:
+                files_desc.append(" * %s" % f)
 
         packages_binary = self.process_packages(binary, vars)
 

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Tue Dec  1 01:01:52 2009	(r14704)
+++ dists/trunk/firmware-nonfree/debian/changelog	Tue Dec  1 01:16:12 2009	(r14705)
@@ -8,6 +8,9 @@
   * Update Radeon firmware for use with Linux 2.6.32 (Closes: #558023)
   * Change URI for firmware-linux-nonfree to refer to David Woodhouse's
     linux-firmware.git repository (Closes: #558033)
+  * Include names of all firmware files in package descriptions
+    (Closes: #553710)
+  * Do not include 'version unknown' in package descriptions
 
  -- maximilian attems <maks at debian.org>  Thu, 12 Nov 2009 11:38:02 +0200