[kernel] r12475 - in dists/trunk/firmware-nonfree: debian/bin ipw2x00

[Bastian Blank]

Author: waldi
Date: Tue Dec  2 17:02:35 2008
New Revision: 12475

Log:
* debian/bin/gencontrol.py: Generate license warning in description.
* ipw2x00/defines: Fix long description.


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

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	(original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Tue Dec  2 17:02:35 2008
@@ -232,6 +232,12 @@
             templates_filename = "debian/firmware-%s.templates" % package
             self.write_rfc822(file(templates_filename, 'w'), templates)
 
+            desc = packages_binary[0]['Description']
+            desc.extend([
+"""Those firmware are covered by the %s, which is available
+at /usr/share/doc/firmware-%s/copyright.""" % (vars['license-title'], package),
+"""By installing this package, you agree the terms of that license."""
+])
             packages_binary[0]['Pre-Depends'] = PackageRelation('debconf | debconf-2.0')
 
         packages.extend(packages_binary)

Modified: dists/trunk/firmware-nonfree/ipw2x00/defines
==============================================================================
--- dists/trunk/firmware-nonfree/ipw2x00/defines	(original)
+++ dists/trunk/firmware-nonfree/ipw2x00/defines	Tue Dec  2 17:02:35 2008
@@ -8,12 +8,8 @@
  ipw2200-ibss.fw
  ipw2200-sniffer.fw
 license-accept: required                                                                                                       
-license-title: Intel Pro Wireless 2100 and 2200 License
-longdesc: Intel Pro Wireless 2100, 2200 and 2915 cards.
- Those firmware are covered by the Intel license, which is available 
- at /usr/share/doc/firmware-ipw2x00/copyright.
- .
- By installing this package, you agree the terms of that license.
+license-title: Intel Pro Wireless 2100 and 2200/2915 License
+longdesc: Intel Pro Wireless 2100, 2200 and 2915 cards
 uri: http://ipw2100.sourceforge.net/firmware.php?fid=4 http://ipw2200.sourceforge.net/firmware.php?fid=7
 
 [ipw2100-1.3.fw_base]