01/02: licenses: Rename 'bsd-style' to 'non-copyleft'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit b3345dc41abd81b048d9e712db235dfd404e1bfe
Author: Ludovic Courtès <address@hidden>
Date:   Sat Mar 14 19:25:00 2015 +0100

    licenses: Rename 'bsd-style' to 'non-copyleft'.
    
    * guix/licenses.scm (bsd-style): Rename to...
      (non-copyleft): ... this.  Clarify docstring.
      (bsd-style): Introduce as an alias for 'non-copyleft'.
---
 guix/licenses.scm |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index 157e74b..dfc8c6a 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <address@hidden>
 ;;;
@@ -24,7 +24,9 @@
             agpl3 agpl3+
             asl2.0
             boost1.0
-            bsd-2 bsd-3 bsd-4 bsd-style
+            bsd-2 bsd-3 bsd-4
+            non-copyleft
+            bsd-style                             ;deprecated!
             cc0
             cddl1.0
             cecill-c
@@ -105,16 +107,23 @@
            "http://directory.fsf.org/wiki/License:BSD_4Clause";
            "https://www.gnu.org/licenses/license-list#OriginalBSD";))
 
-(define* (bsd-style uri #:optional (comment ""))
-  "Return a BSD-style license, whose full text can be found at URI,
-which may be a file:// URI pointing the package's tree."
-  (license "BSD-style"
+(define* (non-copyleft uri #:optional (comment ""))
+  "Return a lax, permissive, non-copyleft license (for example a variant of
+the 3-clause BSD license or the Expat license), whose full text can be found
+at URI, which may be a file:// URI pointing the package's tree."
+  (license "non-copyleft"
            uri
            (string-append
-            "This is a BSD-style, non-copyleft free software license.  "
+            "This is a lax, non-copyleft free software license.  "
             "Check the URI for details.  "
             comment)))
 
+(define bsd-style
+  ;; This alias is kept for backward-compatibility.  Do not use it for new
+  ;; packages: it is ambiguous, as rightfully explained at
+  ;; <http://www.gnu.org/philosophy/words-to-avoid.html#BSD-style>.
+  non-copyleft)
+
 (define cc0
   (license "CC0"
            "http://directory.fsf.org/wiki/License:CC0";