diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-20 22:11:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-20 22:11:33 +0000 |
| commit | 902535c7254bf174a7df4a0c67fcff6ff251dd45 (patch) | |
| tree | 3d57b184143111be624aabffc784c4fa99c6e10d /profiles | |
| parent | amd64 stable wrt security bug #261386 (diff) | |
| download | gentoo-2-902535c7254bf174a7df4a0c67fcff6ff251dd45.tar.gz gentoo-2-902535c7254bf174a7df4a0c67fcff6ff251dd45.tar.bz2 gentoo-2-902535c7254bf174a7df4a0c67fcff6ff251dd45.zip | |
Add more licenses to GPL-COMPATIBLE and create new FSF-APPROVED and
OSI-APPROVED license groups. Thanks to Marek Aaron Sapota
<projects.gg.aaron@gmail.com> for submitting these changes (bug #152593).
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/license_groups | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 3969bdd29703..fcc5f4ec0b85 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2452 2009/03/20 14:49:38 a3li Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.2453 2009/03/20 22:11:32 zmedico 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! + 20 Mar 2009; Zac Medico <zmedico@gentoo.org> license_groups: + Add more licenses to GPL-COMPATIBLE and create new FSF-APPROVED and + OSI-APPROVED license groups. Thanks to Marek Aaron Sapota + <projects.gg.aaron@gmail.com> for submitting these changes (bug #152593). + 20 Mar 2009; Alex Legler <a3li@gentoo.org> package.mask: Masking Ruby 1.9.1 and a special Rubygems version for testing diff --git a/profiles/license_groups b/profiles/license_groups index f2bea7d151d9..de8998da00fe 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,9 +1,11 @@ # Copyright 2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.2 2007/11/04 03:48:42 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.3 2009/03/20 22:11:33 zmedico Exp $ # GLEP-0023 # http://www.gentoo.org/proj/en/glep/glep-0023.html # http://www.fsf.org/licensing/licenses/index_html -GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 BSD BSD-2 Boost-1.0 GPL-2 GPL-3 Intel LGPL-2.1 LGPL-3 PYTHON Ruby W3C W3C-document X11 ZLIB public-domain ZPL +FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CPL-1.0 EPL-1.0 IBM LPPL-1.2 Ms-PL MPL-1.0 MPL-1.1 NPL-1.1 OSL-1.1 OSL-2.0 OSL-2.1 openssl PHP-3.01 QPL QPL-1.0 SPL +GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-2 GPL-3 Intel ISC libX11 LGPL-2.1 LGPL-3 OPENLDAP OracleDB PYTHON Ruby unicode vim W3C W3C-document WTFPL-2 X11 ZLIB public-domain ZPL +OSI-APPROVED AFL-3.0 APL-1.0 Apache-2.0 Artistic Artistic-2 BSD BSD-2 Boost-1.0 CDDL CPL-1.0 EPL EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 IPL-1 IBM ISC MIT Ms-PL MPL-1.1 nethack OGTSL PHP PYTHON QPL SPL wxWinLL-3 ZPL ZLIB |