summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-10-19 09:09:47 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-10-19 09:09:47 +0000
commitc9ac67b495758f4be7742747ef9c9ee47f8a340c (patch)
treec98f6d92e223f5061f989002f9c3c52f39e2873d /profiles/license_groups
parentRemoved gst-plugins-amrnb and gst-plugins-amrwb from tree. (diff)
downloadhistorical-c9ac67b495758f4be7742747ef9c9ee47f8a340c.tar.gz
historical-c9ac67b495758f4be7742747ef9c9ee47f8a340c.tar.bz2
historical-c9ac67b495758f4be7742747ef9c9ee47f8a340c.zip
Add PSF licenses to OSI-APPROVED and GPL-COMPATIBLE per http://www.gnu.org/philosophy/license-list.html and http://www.opensource.org/licenses/alphabetical
Diffstat (limited to 'profiles/license_groups')
-rw-r--r--profiles/license_groups6
1 files changed, 3 insertions, 3 deletions
diff --git a/profiles/license_groups b/profiles/license_groups
index 51a7a64db2e9..eed1fca03b3e 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# 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.8 2009/10/10 17:57:43 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.9 2009/10/19 09:09:47 loki_val Exp $
# GLEP-0023
# http://www.gentoo.org/proj/en/glep/glep-0023.html
@@ -8,5 +8,5 @@
EULA BCS Broadcom DOOM3 ETQW ETQW Introversion Livestation-EULA.txt LOKI-EULA LOKI-EULA LOKI-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA THINKTANKS ut2003 ut2003 ut2003-demo
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 as-is BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-2 GPL-3 Intel ISC libX11 LGPL-2.1 LGPL-3 MIT 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
+GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 as-is BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-2 GPL-3 Intel ISC libX11 LGPL-2.1 LGPL-3 MIT OPENLDAP OracleDB PYTHON PSF-2.2 PSF-2.3 PSF-2.4 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 PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 ZPL ZLIB