From 8edb4bfb9daad1647567584f8d0fd6c36dabaa13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 12 Apr 2015 21:36:04 +0000 Subject: [PATCH] Add OSL-2.1 and UoI-NCSA licenses to the OSI-APPROVED group. --- profiles/ChangeLog | 5 ++++- profiles/license_groups | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 89df379d26c8..17c892363348 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9925 2015/04/12 21:15:39 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9926 2015/04/12 21:36:04 ulm Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 12 Apr 2015; Ulrich Müller license_groups: + Add OSL-2.1 and UoI-NCSA licenses to the OSI-APPROVED group. + 12 Apr 2015; Ulrich Müller license_groups: CPAL-1.0, gnuplot, CC-BY-*, and CC-BY-SA-* licenses are FSF approved now. Move them to the appropriate groups. diff --git a/profiles/license_groups b/profiles/license_groups index b0647e9f83db..a79e89a1103f 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.258 2015/04/12 21:15:39 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.259 2015/04/12 21:36:04 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -18,7 +18,7 @@ GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EUPL-1.1 gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 # http://www.opensource.org/licenses -OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat W3C Watcom-1.0 wxWinLL-3 wxWinLL-3.1 ZLIB ZPL +OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 wxWinLL-3.1 ZLIB ZPL # Misc licenses that are probably free software, i.e. follow the # Free Software Definition at http://www.gnu.org/philosophy/free-sw.html -- 2.26.2