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

[Ben Hutchings]

Author: benh
Date: Mon May  4 22:50:47 2009
New Revision: 13564

Log:
Fix grammatical errors in the templates for package descriptions, copyright files and EULA prompts

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/templates/copyright.binary.in
   dists/trunk/firmware-nonfree/debian/templates/templates.license.in

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Mon May  4 22:33:49 2009	(r13563)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Mon May  4 22:50:47 2009	(r13564)
@@ -238,8 +238,8 @@
 
             desc = packages_binary[0]['Description']
             desc.append(
-"""Those firmware are covered by the %s.
-Prior to installing this package, you have to agree to the terms of that license."""
+"""This firmware is covered by the %s.
+You must agree to the terms of this license before it is installed."""
 % vars['license-title'])
             packages_binary[0]['Pre-Depends'] = PackageRelation('debconf | debconf-2.0')
 

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon May  4 22:33:49 2009	(r13563)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon May  4 22:50:47 2009	(r13564)
@@ -10,6 +10,8 @@
   * Add Ralink RT2860/RT2890 and RT2870 firmware.
   * Add firmware for use with ivtv and pvrusb2 drivers (closes: #524230),
     thanks to Ian Campbell <ijc at hellion.org.uk>.
+  * Fix grammatical errors in the templates for package descriptions,
+    copyright files and EULA prompts
 
   [ dann frazier ]
   * Fix subject-verb agreement problem in firmware-linux description.

Modified: dists/trunk/firmware-nonfree/debian/templates/copyright.binary.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/copyright.binary.in	Mon May  4 22:33:49 2009	(r13563)
+++ dists/trunk/firmware-nonfree/debian/templates/copyright.binary.in	Mon May  4 22:50:47 2009	(r13564)
@@ -1,3 +1,3 @@
-The binary firmwares are downloaded from @uri at .
+The binary firmware may be downloaded from @uri at .
 
 @license@

Modified: dists/trunk/firmware-nonfree/debian/templates/templates.license.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/templates.license.in	Mon May  4 22:33:49 2009	(r13563)
+++ dists/trunk/firmware-nonfree/debian/templates/templates.license.in	Mon May  4 22:50:47 2009	(r13564)
@@ -8,7 +8,7 @@
 Description: Do you agree with the @license-title@ license terms?
  In order to install this package, you must agree to its license terms, the
  "@license-title@".
- Not accepting will cancel the installation.
+ If you do not agree, the installation will be canceled.
 
 Template: firmware- at package@/license/error
 Type: error
@@ -16,5 +16,5 @@
  If you do not agree to the "@license-title@" 
  license terms you cannot install this software.
  .
- The installation of this package will be canceled.
+ The installation of this package has been canceled.