diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2010-01-07 11:09:30 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2010-01-07 11:09:30 +0000 |
| commit | 0da44c3ff3bfb1bbbb53daa8be7d6eb2b4554c12 (patch) | |
| tree | b39b78f4eed9558965bdaf4df5df906fdfcfb3b5 | |
| parent | pg_legacytimestamp logic got inverted. Fixing it to work as expected. (diff) | |
| download | gentoo-2-0da44c3ff3bfb1bbbb53daa8be7d6eb2b4554c12.tar.gz gentoo-2-0da44c3ff3bfb1bbbb53daa8be7d6eb2b4554c12.tar.bz2 gentoo-2-0da44c3ff3bfb1bbbb53daa8be7d6eb2b4554c12.zip | |
Add license groups for free documents and misc free software licenses
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/license_groups | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 44d0c097b9e3..97011f581cf3 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.3748 2010/01/07 00:36:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3749 2010/01/07 11:09:30 hanno 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! + 07 Jan 2010; Hanno Boeck <hanno@gentoo.org> license_groups: + Add license_groups for free documents and for misc software licenses. + 07 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> package.mask: Masking dev-java/jrockit-jdk-bin for QA removal. diff --git a/profiles/license_groups b/profiles/license_groups index 34cee2bcab96..8cdfb0015831 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # 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.18 2010/01/02 11:32:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.19 2010/01/07 11:09:30 hanno Exp $ # GLEP-0023 # http://www.gentoo.org/proj/en/glep/glep-0023.html @@ -11,6 +11,14 @@ FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorren GPL-COMPATIBLE Apache-2.0 Artistic Artistic-2 as-is BSD BSD-2 Boost-1.0 CeCILL-2 FTL GPL-2 GPL-3 Intel ISC libX11 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 W3C-document WTFPL-2 X11 ZLIB public-domain ZPL OSI-APPROVED AFL-3.0 APL-1.0 Apache-2.0 Artistic Artistic-2 BSD BSD-2 Boost-1.0 CDDL CPL-1.0 EPL EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 IPL-1 IBM ISC MIT Ms-PL MPL-1.1 nethack OGTSL PHP PSF-2.2 PSF-2.3 PSF-2.4 PYTHON QPL SPL wxWinLL-3 ZPL ZLIB +# Misc licenses that are probably free software but not approved by either FSF or OSI +# Preferrably on the long term these should be cleared up and moved to other sets +MISC-FREE BZIP2 w3m CRACKLIB FLEX LGPL-2 libgcc libstdc++ PAM popt SMAIL tcp_wrappers_license cryptopp JamesClark Subversion + +# Licenses for free documents, following the definition at +# http://freedomdefined.org/ +FREE-DOCUMENTS FDL-1.1 FDL-1.2 FDL-1.3 CCPL-Attribution-2.0 CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 CC-PD + # 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. |