1 |
ulm 10/01/07 18:26:19 |
2 |
|
3 |
Modified: ChangeLog license_groups |
4 |
Log: |
5 |
Add group FSF-APPROVED-OTHER. GPL-1 and LGPL-2 are GPL-COMPATIBLE. Remove PAM and popt. |
6 |
|
7 |
Revision Changes Path |
8 |
1.3752 profiles/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/ChangeLog?rev=1.3752&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/ChangeLog?rev=1.3752&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/ChangeLog?r1=1.3751&r2=1.3752 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v |
17 |
retrieving revision 1.3751 |
18 |
retrieving revision 1.3752 |
19 |
diff -u -r1.3751 -r1.3752 |
20 |
--- ChangeLog 7 Jan 2010 15:09:51 -0000 1.3751 |
21 |
+++ ChangeLog 7 Jan 2010 18:26:18 -0000 1.3752 |
22 |
@@ -1,11 +1,16 @@ |
23 |
# ChangeLog for profile directory |
24 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3751 2010/01/07 15:09:51 ssuominen Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3752 2010/01/07 18:26:18 ulm Exp $ |
27 |
# |
28 |
# This ChangeLog should include records for all changes in profiles directory. |
29 |
# Only typo fixes which don't affect portage/repoman behaviour could be avoided |
30 |
# here. If in doubt put a record here! |
31 |
|
32 |
+ 07 Jan 2010; Ulrich Mueller <ulm@g.o> license_groups: |
33 |
+ Add new license group FSF-APPROVED-OTHER. Move GPL-1 and LGPL-2 to |
34 |
+ GPL-COMPATIBLE. Remove PAM and popt as these licenses were redundant and |
35 |
+ have been removed from the tree. |
36 |
+ |
37 |
07 Jan 2010; Samuli Suominen <ssuominen@g.o> package.mask: |
38 |
Mask crossvc and esvn for removal. |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.21 profiles/license_groups |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/license_groups?rev=1.21&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/license_groups?rev=1.21&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/license_groups?r1=1.20&r2=1.21 |
48 |
|
49 |
Index: license_groups |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/profiles/license_groups,v |
52 |
retrieving revision 1.20 |
53 |
retrieving revision 1.21 |
54 |
diff -u -r1.20 -r1.21 |
55 |
--- license_groups 7 Jan 2010 11:27:45 -0000 1.20 |
56 |
+++ license_groups 7 Jan 2010 18:26:18 -0000 1.21 |
57 |
@@ -1,23 +1,30 @@ |
58 |
# Copyright 2007 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.20 2010/01/07 11:27:45 hanno Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.21 2010/01/07 18:26:18 ulm Exp $ |
62 |
|
63 |
# GLEP-0023 |
64 |
# http://www.gentoo.org/proj/en/glep/glep-0023.html |
65 |
# http://www.fsf.org/licensing/licenses/index_html |
66 |
|
67 |
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 |
68 |
+ |
69 |
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 |
70 |
-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 |
71 |
+ |
72 |
+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 W3C-document WTFPL-2 X11 ZLIB public-domain ZPL |
73 |
+ |
74 |
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 |
75 |
|
76 |
# Misc licenses that are probably free software but not approved by either FSF or OSI |
77 |
# Preferrably on the long term these should be cleared up and moved to other sets |
78 |
-MISC-FREE BZIP2 w3m CRACKLIB FLEX LGPL-2 libgcc libstdc++ PAM popt SMAIL tcp_wrappers_license cryptopp JamesClark Subversion DSNIFF wxWinLL-3 MaxMind PDFLite gcc-runtime-library-exception-3.1 GPL-1 GPL-2-with-linking-exception GPL-2-with-exceptions imagemagick ElementTree OpenSoftware LLGPL-2.1 DB LPPL-1.3 Info-ZIP gnuplot CMake TeX WordNet-2.1 PHP-3 LPPL-1.3c gsm JNIC |
79 |
+MISC-FREE BZIP2 w3m CRACKLIB FLEX libgcc libstdc++ SMAIL tcp_wrappers_license cryptopp JamesClark Subversion DSNIFF wxWinLL-3 MaxMind PDFLite gcc-runtime-library-exception-3.1 GPL-2-with-linking-exception GPL-2-with-exceptions imagemagick ElementTree OpenSoftware LLGPL-2.1 DB LPPL-1.3 Info-ZIP gnuplot CMake TeX WordNet-2.1 PHP-3 LPPL-1.3c gsm JNIC |
80 |
+ |
81 |
+# FSF-approved licenses for "free documentation" and "works of |
82 |
+# practical use besides software and documentation" (including fonts) |
83 |
+FSF-APPROVED-OTHER Arphic CCPL-Attribution-2.0 CCPL-Attribution-ShareAlike-2.0 DSL FDL-1.1 FDL-1.2 FDL-1.3 FreeArt GPL-1 GPL-2 GPL-3 OFL-1.1 OPL |
84 |
|
85 |
# Licenses for free documents, following the definition at |
86 |
# http://freedomdefined.org/ |
87 |
-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 BitstreamVera myspell-en_CA-KevinAtkinson |
88 |
+FREE-DOCUMENTS @FSF-APPROVED-OTHER CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 CC-PD BitstreamVera myspell-en_CA-KevinAtkinson |
89 |
|
90 |
# As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml |
91 |
# Excerpt of the rules for this license group: |