diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-09-21 14:33:14 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-09-21 14:33:14 +0000 |
| commit | 256a2a401f8ccd7e9ba52a32fa68968033684d75 (patch) | |
| tree | f6b2171aebb327f67c4afb3e23a50cec6b1b6289 | |
| parent | Remove old. (diff) | |
| download | gentoo-2-256a2a401f8ccd7e9ba52a32fa68968033684d75.tar.gz gentoo-2-256a2a401f8ccd7e9ba52a32fa68968033684d75.tar.bz2 gentoo-2-256a2a401f8ccd7e9ba52a32fa68968033684d75.zip | |
Add GPL-1+ and LGPL-2+ to the OSI-APPROVED group.
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index f259a62e149f..3bb2d0fc70ad 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6978 2012/09/20 11:42:56 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6979 2012/09/21 14:33:14 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! + 21 Sep 2012; Ulrich Müller <ulm@gentoo.org> license_groups: + Add GPL-1+ and LGPL-2+ to the OSI-APPROVED group. + 20 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> +features/multilib/package.use.mask, base/package.use.force, base/package.use.mask: diff --git a/profiles/license_groups b/profiles/license_groups index 149ace08328a..139987bc0377 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.121 2012/09/17 18:56:23 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.122 2012/09/21 14:33:14 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -16,7 +16,7 @@ GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CC0-1.0-Un FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 EUPL-1.1 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 as-is Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-2 GPL-2+ GPL-3 GPL-3+ IBM IPAfont ISC 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 OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL W3C 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 as-is Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ 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 OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL W3C 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 |