summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-01-29 05:39:52 +0000
committerUlrich Müller <ulm@gentoo.org>2010-01-29 05:39:52 +0000
commit0a680d22250c1e25346801cae5e5ed5051c5699d (patch)
treecb78e6748d8b5de48eeb65ac4bd4c3591280cfc1 /profiles/license_groups
parentReinstate erroneously removed patch thanks to toomore_such (bug #302566). (diff)
downloadgentoo-2-0a680d22250c1e25346801cae5e5ed5051c5699d.tar.gz
gentoo-2-0a680d22250c1e25346801cae5e5ed5051c5699d.tar.bz2
gentoo-2-0a680d22250c1e25346801cae5e5ed5051c5699d.zip
Re-add Artistic to OSI-APPROVED.
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 ce38c8b21f70..0dc8274987e0 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.33 2010/01/28 23:32:11 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.34 2010/01/29 05:39:52 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -14,13 +14,13 @@ GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 D
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
# http://www.opensource.org/licenses
-OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic-2 Boost-1.0 BSD BSD-2 CDDL CPL-1.0 EPL EPL-1.0 GPL-2 GPL-3 IBM IPL-1 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 Ms-PL nethack OGTSL PHP PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 ZLIB ZPL
+OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CPL-1.0 EPL EPL-1.0 GPL-2 GPL-3 IBM IPL-1 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 Ms-PL nethack OGTSL PHP PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 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
# but are not approved by either FSF or OSI. Preferably on the long
# term these should be cleared up and moved to other sets.
-MISC-FREE ANTLR BEER-WARE BZIP2 CDDL-Schily CMake CRACKLIB cryptopp eGenixPublic-1.1 ElementTree Emacs FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm IDPL imagemagick Info-ZIP JamesClark JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH iASL
+MISC-FREE ANTLR BEER-WARE BZIP2 CDDL-Schily CMake CRACKLIB cryptopp eGenixPublic-1.1 ElementTree Emacs FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm iASL IDPL imagemagick Info-ZIP JamesClark JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH
# Metaset for all free software
FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE