Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove the X11 licence

git-svn-id: https://svn.r-project.org/R/trunk@62415 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 99027623f9912eddb9c47b457f4315e286ac747b 1 parent 43babd7
ripley authored
Showing with 10 additions and 6 deletions.
  1. +10 −0 doc/NEWS.Rd
  2. +0 −6 share/licenses/license.db
View
10 doc/NEWS.Rd
@@ -39,6 +39,16 @@
}
}
+ \subsection{PACKAGE INSTALLATION}{
+ \itemize{
+ \item In the \file{DESCRIPTION} file, \preformatted{ License: X11}
+ is no longer recognized as valid, since it includes
+ \sQuote{Copyright (C) 1996 X Consortium} which cannot be
+ appropriate for a current \R package. Use \sQuote{MIT} or
+ \sQuote{BSD_2_clause} instead.
+ }
+ }
+
\subsection{DEPRECATED AND DEFUNCT}{
\itemize{
\item \code{chol(pivot = TRUE, LINPACK = TRUE)} is defunct.
View
6 share/licenses/license.db
@@ -168,12 +168,6 @@ FSF: free_and_GPLv3_compatible (http://www.gnu.org/licenses/license-list.html#MP
URL: http://www.mozilla.org/MPL/2.0
FOSS: yes
-Name: X11 License
-Abbrev: X11
-FSF: free_and_GPLv3_compatible (http://www.gnu.org/licenses/license-list.html#X11License)
-URL: http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3
-FOSS: yes
-
Name: Common Public License
Abbrev: CPL
Version: 1.0
Please sign in to comment.
Something went wrong with that request. Please try again.