diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-10-06 20:11:31 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-10-06 20:11:31 +0000 |
| commit | 823e3c4855d25111141c3a333fabb6739240fc41 (patch) | |
| tree | ca47b2f6103bb56970eeedfe54039032c776fc8e /profiles | |
| parent | Add non-license for metapackages that don't install any files. (diff) | |
| download | gentoo-2-823e3c4855d25111141c3a333fabb6739240fc41.tar.gz gentoo-2-823e3c4855d25111141c3a333fabb6739240fc41.tar.bz2 gentoo-2-823e3c4855d25111141c3a333fabb6739240fc41.zip | |
Add metapackage non-license to GPL-COMPATIBLE license group.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 4 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 32c8eeb7dae4..83d41ab5f022 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7011 2012/10/06 13:59:48 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7012 2012/10/06 20:11:31 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 @@ -8,6 +8,8 @@ 06 Oct 2012; Ulrich Müller <ulm@gentoo.org> license_groups: Add htmlc (the INRIA license) to MISC-FREE license group. + Add metapackage non-license to GPL-COMPATIBLE license group; this is really + a subcategory of public-domain which has been approved by the FSF. 06 Oct 2012; Eray Aslan <eras@gentoo.org> package.mask: Mask mail-mta/nbsmtp for removal diff --git a/profiles/license_groups b/profiles/license_groups index d749593abfab..2bb2d13f121d 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.132 2012/10/06 13:59:48 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.133 2012/10/06 20:11:31 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 Boost-1.0 BSD BSD-2 CC0-1.0-Universal CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 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+ GPL-3-with-font-exception ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ MIT MPL-2.0 OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL +GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0-Universal CeCILL-2 Clarified-Artistic DB FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 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+ GPL-3-with-font-exception ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 OPENLDAP OracleDB PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 tanuki-community unicode Unlicense UoI-NCSA vim W3C WTFPL-2 ZLIB ZPL FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 EUPL-1.1 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 |