diff options
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/ChangeLog | 5 | ||||
-rw-r--r-- | profiles/license_groups | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 461064d80196..4f053d1c4b8d 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for profile directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7318 2013/01/03 16:20:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7319 2013/01/03 16:30:42 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 @@ -9,6 +9,9 @@ 03 Jan 2013; Ulrich Müller <ulm@gentoo.org> license_groups: Add new license group MISC-FREE-DOCS for free documentation and other non-software. Move font licenses from MISC-FREE to it. + Add x2x to MISC-FREE, bug 449944; add Unicode_Fonts_for_Ancient_Scripts to + MISC-FREE-DOCS license group, bug 449152. Remove as-is from MISC-FREE; most + free packages using it were moved to more specific licenses, bug 436214. 03 Jan 2013; Raúl Porcel <armin76@gentoo.org> +default/linux/s390/10.0/s390x/parent, profiles.desc: diff --git a/profiles/license_groups b/profiles/license_groups index bbebf328935d..985fff3a546a 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # 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.162 2013/01/03 16:20:15 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.163 2013/01/03 16:30:41 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy # separation? # 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 NCSA-HDF noweb openafs-krb5-a OpenSoftware Openwall 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 w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH +MISC-FREE Allegro ANTLR 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 NCSA-HDF noweb openafs-krb5-a OpenSoftware Openwall 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 w3m wxWinLL-3 x2x 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. @@ -48,7 +48,7 @@ FSF-APPROVED-OTHER Arphic CCPL-Attribution-2.0 CCPL-Attribution-ShareAlike-2.0 D # Misc licenses for free documents and other works (including fonts) # that follow the definition at http://freedomdefined.org/ but are NOT # listed in @FSF-APPROVED-OTHER. -MISC-FREE-DOCS BitstreamVera CC-PD CCPL-Attribution-2.5 CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 CCPL-ShareAlike-1.0 LDP-1 LDP-1a man-pages man-pages-posix MaxMind2 mplus-fonts myspell-en_CA-KevinAtkinson Texinfo-manual UbuntuFontLicense-1.0 vlgothic wxWinFDL-3 +MISC-FREE-DOCS BitstreamVera CC-PD CCPL-Attribution-2.5 CCPL-Attribution-3.0 CCPL-Attribution-ShareAlike-2.5 CCPL-Attribution-ShareAlike-3.0 CCPL-ShareAlike-1.0 LDP-1 LDP-1a man-pages man-pages-posix MaxMind2 mplus-fonts myspell-en_CA-KevinAtkinson Texinfo-manual UbuntuFontLicense-1.0 Unicode_Fonts_for_Ancient_Scripts vlgothic wxWinFDL-3 # Metaset for all free documents FREE-DOCUMENTS @FSF-APPROVED-OTHER @MISC-FREE-DOCS |