diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-01-09 19:41:10 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-01-09 19:41:10 +0000 |
| commit | e334cbe92eb86d42459a263c0f313a720b9eeea1 (patch) | |
| tree | 8a52bfe44444563a184ebbe654754f462d0e219d /profiles | |
| parent | Transfer Prefix keywords (diff) | |
| download | gentoo-2-e334cbe92eb86d42459a263c0f313a720b9eeea1.tar.gz gentoo-2-e334cbe92eb86d42459a263c0f313a720b9eeea1.tar.bz2 gentoo-2-e334cbe92eb86d42459a263c0f313a720b9eeea1.zip | |
Add skype-eula to EULA license group, bug 296801.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/license_groups | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 354d343c9917..2b9a256163be 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3765 2010/01/09 18:10:43 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3766 2010/01/09 19:41:10 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! + 09 Jan 2010; Ulrich Mueller <ulm@gentoo.org> license_groups: + Add skype-eula to EULA license group, bug 296801. + 09 Jan 2010; Jeremy Olexa <darkside@gentoo.org> package.mask: p.mask gcc-nios2, noarp, aewm++-goodies, libdsp, x3270, xxdiff, welcome2l. See respective bug numbers in package.mask file diff --git a/profiles/license_groups b/profiles/license_groups index e107c8157870..a7fec690f6fd 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,13 +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.23 2010/01/09 13:14:11 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.24 2010/01/09 19:41:10 ulm Exp $ # GLEP-0023 # http://www.gentoo.org/proj/en/glep/glep-0023.html # http://www.fsf.org/licensing/licenses/index_html -EULA BCS Broadcom dlj-1.1 DOOM3 ETQW ETQW IBM-J1.4 IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LOKI-EULA LOKI-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003 ut2003-demo - GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 as-is BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-1 GPL-2 GPL-3 Intel ISC libX11 LGPL-2 LGPL-2.1 LGPL-3 lsof MIT OPENLDAP OracleDB PYTHON PSF-2.2 PSF-2.3 PSF-2.4 SGI-B-2.0 Ruby unicode vim W3C WTFPL-2 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 @@ -32,6 +30,8 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER CCPL-Attribution-3.0 CCPL-Attribution-ShareAl # Collection of all licenses with the freedom to use, share, modify and share modifications FREE @FREE-SOFTWARE @FREE-DOCUMENTS +EULA BCS Broadcom dlj-1.1 DOOM3 ETQW ETQW IBM-J1.4 IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LOKI-EULA LOKI-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA skype-eula sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003 ut2003-demo + # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml # Excerpt of the rules for this license group: # - MUST permit redistribution in binary form. |