diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-12-01 07:18:43 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-12-01 07:18:43 +0000 |
| commit | 448ebe5ebfdc83bd18225e9efa5e2264abb94faf (patch) | |
| tree | eddcbe341f5a0225e834be4dfcf0dd75ac35d701 /profiles | |
| parent | Fix build with libtool 2.4 by patching up the build system to work with autom... (diff) | |
| download | historical-448ebe5ebfdc83bd18225e9efa5e2264abb94faf.tar.gz historical-448ebe5ebfdc83bd18225e9efa5e2264abb94faf.tar.bz2 historical-448ebe5ebfdc83bd18225e9efa5e2264abb94faf.zip | |
Add CPL-0.5 to the MISC-FREE license group, as it is almost identical with CPL-1.0.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index b277c8fa4c6f..4145b1b2df19 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4823 2010/11/30 20:51:21 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4824 2010/12/01 07:18:43 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! + 01 Dec 2010; Ulrich Mueller <ulm@gentoo.org> license_groups: + Add CPL-0.5 to the MISC-FREE license group, as it is almost identical with + CPL-1.0. + 30 Nov 2010; Peter Volkov <pva@gentoo.org> package.mask: Unmask wireshark-1.4*, stable version in tree now. diff --git a/profiles/license_groups b/profiles/license_groups index ab47a89513d8..ee1bc321d031 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.54 2010/11/30 02:11:52 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.55 2010/12/01 07:18:43 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -22,7 +22,7 @@ OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2 # term these should be cleared up and moved to other sets. # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation? # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath -MISC-FREE ANTLR bea.ri.jsr173 BEER-WARE BZIP2 CC0-1.0-Universal CDDL-Schily CMake CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs FastCGI FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-2.02 PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH kilgard +MISC-FREE ANTLR bea.ri.jsr173 BEER-WARE BZIP2 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs FastCGI FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC kilgard LLGPL-2.1 LPPL-1.3 LPPL-1.3b LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-2.02 PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH # Metaset for all free software FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE |