summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2010-02-02 15:36:38 +0000
committerHanno Böck <hanno@gentoo.org>2010-02-02 15:36:38 +0000
commitde0b226447225d2eb28e2453965b03e3d84bb6ff (patch)
treefa58695408ff22be5c6b573571c984091c63f4a2 /profiles/license_groups
parentDrop font.eclass calls that are useless and wont be present anymore in next v... (diff)
downloadgentoo-2-de0b226447225d2eb28e2453965b03e3d84bb6ff.tar.gz
gentoo-2-de0b226447225d2eb28e2453965b03e3d84bb6ff.tar.bz2
gentoo-2-de0b226447225d2eb28e2453965b03e3d84bb6ff.zip
add more licenses to gpl-compatible set
Diffstat (limited to 'profiles/license_groups')
-rw-r--r--profiles/license_groups4
1 files changed, 2 insertions, 2 deletions
diff --git a/profiles/license_groups b/profiles/license_groups
index 0dc8274987e0..c17491002a90 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 2007-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.34 2010/01/29 05:39:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.35 2010/02/02 15:36:38 hanno Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -9,7 +9,7 @@
# http://www.gentoo.org/proj/en/glep/glep-0023.html
# http://www.fsf.org/licensing/licenses/
-GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 DB FTL GPL-1 GPL-2 GPL-3 Intel ISC LGPL-2 LGPL-2.1 LGPL-3 MIT OPENLDAP OracleDB PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 unicode UoI-NCSA vim W3C WTFPL-2 X11 ZLIB ZPL
+GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 DB FTL GPL-1 GPL-2 GPL-2-with-font-exception GPL-2-with-Linden-Lab-FLOSS-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception Intel ISC LGPL-2 LGPL-2.1 LGPL-3 MIT OPENLDAP OracleDB PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON Ruby SGI-B-2.0 unicode UoI-NCSA vim W3C WTFPL-2 X11 ZLIB 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 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 SPL