diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-02-24 17:14:37 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-02-24 17:14:37 +0000 |
| commit | 796b278755e94981b2c91618f26515bed5fd5e1a (patch) | |
| tree | 6221441aef95464415513601a23c527ddcc52044 /profiles | |
| parent | Marking SQL-Statement-1.330.0 ppc for bug 400225 (diff) | |
| download | gentoo-2-796b278755e94981b2c91618f26515bed5fd5e1a.tar.gz gentoo-2-796b278755e94981b2c91618f26515bed5fd5e1a.tar.bz2 gentoo-2-796b278755e94981b2c91618f26515bed5fd5e1a.zip | |
Add Unlicense to GPL-COMPATIBLE license group.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 426d1aa3f8ce..51e65a35cd64 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6243 2012/02/23 23:46:48 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6244 2012/02/24 17:14:37 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! + 24 Feb 2012; Ulrich Müller <ulm@gentoo.org> license_groups: + Add Unlicense to GPL-COMPATIBLE license group. + 23 Feb 2012; Markos Chandras <hwoarang@gentoo.org> package.mask: Unmask x11-misc/lightdm-1.1.3 diff --git a/profiles/license_groups b/profiles/license_groups index d09571a1a34c..884f42de16a3 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.104 2012/02/15 23:16:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.105 2012/02/24 17:14:37 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -11,7 +11,7 @@ # http://www.gnu.org/licenses/license-list.html # GPL or LGPL with various exceptions are also included here, because # they are more permissive than the licenses they are based on. -GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-FPC LGPL-3 libgcc libstdc++ MIT OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby SGI-B-2.0 tanuki-community unicode UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL +GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-2 GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-3 GPL-3-with-font-exception ISC LGPL-2 LGPL-2.1 LGPL-2.1-FPC LGPL-3 libgcc libstdc++ MIT OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby SGI-B-2.0 tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL 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 |