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

[Ben Hutchings]

Author: benh
Date: Mon May  3 21:48:04 2010
New Revision: 15602

Log:
Merge preinstallation license note and question (Closes: #574145)

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/templates/preinst.license.in
   dists/trunk/firmware-nonfree/debian/templates/templates.license.in

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Mon May  3 20:59:57 2010	(r15601)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon May  3 21:48:04 2010	(r15602)
@@ -9,6 +9,7 @@
   * Update iwlwifi-6000 to 9.193.4.1.
   * Add copyright and licence text for radeon/R{6,7}00_rlc.bin to
     firmware-linux-nonfree (Closes: #576104)
+  * Merge preinstallation license note and question (Closes: #574145)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 15 Mar 2010 13:50:12 +0000
 

Modified: dists/trunk/firmware-nonfree/debian/templates/preinst.license.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/preinst.license.in	Mon May  3 20:59:57 2010	(r15601)
+++ dists/trunk/firmware-nonfree/debian/templates/preinst.license.in	Mon May  3 21:48:04 2010	(r15602)
@@ -28,12 +28,6 @@
         1)  # present license
             db_get firmware- at package@/license/accepted
             if [ "$RET" != true -o "${license_accept}" = "no-preseed" ]; then
-                db_fset firmware- at package@/license/present seen false
-                if ! db_input critical firmware- at package@/license/present ; then
-                    errmsg "firmware- at package@ license could not be presented"
-                    exit 2
-                fi
-
                 db_fset firmware- at package@/license/accepted seen false
                 if ! db_input critical firmware- at package@/license/accepted ; then
                     errmsg "firmware- at package@ agree question could not be asked"

Modified: dists/trunk/firmware-nonfree/debian/templates/templates.license.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/templates.license.in	Mon May  3 20:59:57 2010	(r15601)
+++ dists/trunk/firmware-nonfree/debian/templates/templates.license.in	Mon May  3 21:48:04 2010	(r15602)
@@ -1,14 +1,11 @@
-Template: firmware- at package@/license/present
-Type: note
-Description: @license-title@
-
 Template: firmware- at package@/license/accepted
 Type: boolean
 Default: false
 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@".
+ In order to install this package, you must agree to the following terms,
+ the "@license-title@".
  If you do not agree, the installation will be canceled.
+ .
 
 Template: firmware- at package@/license/error
 Type: error