diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-11-13 09:54:30 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-11-13 09:54:30 +0000 |
| commit | 038a21ed45894d8ab7d2b15d169dd914b233e480 (patch) | |
| tree | 690aebe1f3a1be89d94d7db143065993d500fc30 /profiles | |
| parent | Bump. Notable changes: fix for a gnome-shell crash on user status change, oth... (diff) | |
| download | gentoo-2-038a21ed45894d8ab7d2b15d169dd914b233e480.tar.gz gentoo-2-038a21ed45894d8ab7d2b15d169dd914b233e480.tar.bz2 gentoo-2-038a21ed45894d8ab7d2b15d169dd914b233e480.zip | |
Add Apache-1.1 to OSI-APPROVED: http://www.opensource.org/licenses/apachepl-1.1
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 4 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 3e604b91613f..c506f906bfbb 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,13 +1,13 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5899 2011/11/13 09:39:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5900 2011/11/13 09:54:30 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! 13 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups: - Add MPL-1.0 to OSI-APPROVED: http://www.opensource.org/licenses/mozilla1.0 + Add Apache-1.1 and MPL-1.0 to OSI-APPROVED license group. 12 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups: Remove nauty from EULA group. This has previously been discussed in diff --git a/profiles/license_groups b/profiles/license_groups index 4236be47551e..0f5fb21b644f 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.84 2011/11/13 09:39:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.85 2011/11/13 09:54:30 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -14,7 +14,7 @@ GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 C FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI 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 AGPL-3 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-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 LPPL-1.3c MIT MPL-1.0 MPL-1.1 Ms-PL nethack NOSA OFL-1.1 OGTSL OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL SPL 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-2 GPL-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 LPPL-1.3c MIT MPL-1.0 MPL-1.1 Ms-PL nethack NOSA OFL-1.1 OGTSL OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL SPL 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 |