diff options
author | Ulrich Müller <ulm@gentoo.org> | 2013-01-01 20:06:50 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2013-01-01 20:06:50 +0000 |
commit | 70361f8643114dea94907cd50abb79e49cc77d62 (patch) | |
tree | 0b281f103ee4b2f3407d37c981585ee19d18bc2c /profiles | |
parent | [bump] virtual/perl-Term-ANSIColor-4.10.0 (diff) | |
download | historical-70361f8643114dea94907cd50abb79e49cc77d62.tar.gz historical-70361f8643114dea94907cd50abb79e49cc77d62.tar.bz2 historical-70361f8643114dea94907cd50abb79e49cc77d62.zip |
Remove jaxen and saxpath (JDOM duplicates) from MISC-FREE license group.
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/ChangeLog | 5 | ||||
-rw-r--r-- | profiles/license_groups | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index c279db3a2739..3a1816d0a5d1 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7311 2013/01/01 18:25:43 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7312 2013/01/01 20:06:50 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 Jan 2013; Ulrich Müller <ulm@gentoo.org> license_groups: + Remove jaxen and saxpath (JDOM duplicates) from MISC-FREE license group. + 01 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> package.mask: masked dev-haskell/wash for removal diff --git a/profiles/license_groups b/profiles/license_groups index 7121d62c44bb..1c6e73d69cc9 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.159 2012/12/28 18:02:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.160 2013/01/01 20:06:50 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -24,8 +24,8 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist # term these should be cleared up and moved to other sets. # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED # 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 Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH +# BSD-4 alikes: dom4j FastCGI icu JDOM +MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic Ispell JasPer2.0 JDOM JNIC JOVE libmng libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish MIT-with-advertising mplus-fonts NCSA-HDF noweb openafs-krb5-a OpenSoftware otter PCRE perforce PHP-2.02 Princeton psutils pysqlite rc regexp-UofT RSA Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH # The following are NOT valid in @MISC-FREE: # arj - usage restrictions # freedist - Doesn't grant the right to do modifications. |