diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-01-09 13:14:11 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-01-09 13:14:11 +0000 |
| commit | d18313523cb582f16b2292aebb51b20eb84df011 (patch) | |
| tree | b614d4d3adc063e0846c65e3068bb70ba0b1da7f /profiles | |
| parent | Marked ~amd64-linux (bug #300037). Fixed for and marked ~ppc-macos. (diff) | |
| download | gentoo-2-d18313523cb582f16b2292aebb51b20eb84df011.tar.gz gentoo-2-d18313523cb582f16b2292aebb51b20eb84df011.tar.bz2 gentoo-2-d18313523cb582f16b2292aebb51b20eb84df011.zip | |
Remove GPL exceptions, as they can only be used together with GPL itself.
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 620ec7c9e56f..0bace449fd6c 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.3759 2010/01/09 10:53:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3760 2010/01/09 13:14:11 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! + 09 Jan 2010; Ulrich Mueller <ulm@gentoo.org> license_groups: + Remove GPL exceptions, as they can only be used together with GPL itself. + 09 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask: Change KDE 3.5.10, KOffice 1.6.3 mask into a single placeholder. diff --git a/profiles/license_groups b/profiles/license_groups index a8c5d9aaad2e..e107c8157870 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.22 2010/01/09 10:37:42 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.23 2010/01/09 13:14:11 ulm Exp $ # GLEP-0023 # http://www.gentoo.org/proj/en/glep/glep-0023.html @@ -16,7 +16,7 @@ OSI-APPROVED AFL-3.0 APL-1.0 Apache-2.0 Artistic Artistic-2 BSD BSD-2 Boost-1.0 # 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 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 +MISC-FREE BZIP2 w3m CRACKLIB FLEX SMAIL tcp_wrappers_license cryptopp JamesClark Subversion DSNIFF wxWinLL-3 MaxMind PDFLite 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 # Metaset for all free software FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE |