diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-11-25 19:34:52 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-11-25 19:34:52 +0000 |
| commit | 8513c3e11294043af9049b25d3a28f78c15f018f (patch) | |
| tree | 6d5e8c5a6eb094dc30f91cd03f3b3410b02c87f8 /profiles | |
| parent | Update LICENSE: DB and OracleDB are identical, except for the different copyr... (diff) | |
| download | gentoo-2-8513c3e11294043af9049b25d3a28f78c15f018f.tar.gz gentoo-2-8513c3e11294043af9049b25d3a28f78c15f018f.tar.bz2 gentoo-2-8513c3e11294043af9049b25d3a28f78c15f018f.zip | |
Remove DB and OracleDB from GPL-COMPATIBLE and OSI-APPROVED license groups, bug 300426.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 3 | ||||
| -rw-r--r-- | profiles/license_groups | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 81faa152ebd8..df1c5a9aee9a 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.7189 2012/11/25 19:12:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7190 2012/11/25 19:34:52 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,7 @@ 25 Nov 2012; Ulrich Müller <ulm@gentoo.org> license_groups: Add Sleepycat to GPL-COMPATIBLE and OSI-APPROVED license groups, bug 300426. + This replaces DB and OracleDB, remove them from both license groups. Add IBPP-1.1 to MISC-FREE license group, bug 444626. 25 Nov 2012; Julian Ospald <hasufell@gentoo.org> package.mask: diff --git a/profiles/license_groups b/profiles/license_groups index 9073b3b16023..f83195b152b7 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.141 2012/11/25 19:12:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.142 2012/11/25 19:34:52 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -11,12 +11,12 @@ # 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++ 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 Sleepycat 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 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 PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat 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 # http://www.opensource.org/licenses -OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat 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 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EUPL-1.1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL Sleepycat 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 |