[kernel] r12477 - dists/trunk/firmware-nonfree/debian/bin

[Bastian Blank]

Author: waldi
Date: Tue Dec  2 17:07:04 2008
New Revision: 12477

Log:
debian/bin/gencontrol.py: Update wording of license warning.


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

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:07:04 2008
@@ -233,11 +233,10 @@
             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."""
-])
+            desc.append(
+"""Those firmware are covered by the %s.
+Prior to installing this package, you have to agree to the terms of that license."""
+% vars['license-title'])
             packages_binary[0]['Pre-Depends'] = PackageRelation('debconf | debconf-2.0')
 
         packages.extend(packages_binary)