diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-11-16 15:17:06 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-11-16 15:17:06 +0000 |
| commit | 129fcdd77769ba2e09942ff3cc874496b5bbe3c7 (patch) | |
| tree | f2b3a3b3612ebfe2fd920659def1e674c82b730f /profiles | |
| parent | bump; 1.4.2, tested fine (diff) | |
| download | gentoo-2-129fcdd77769ba2e09942ff3cc874496b5bbe3c7.tar.gz gentoo-2-129fcdd77769ba2e09942ff3cc874496b5bbe3c7.tar.bz2 gentoo-2-129fcdd77769ba2e09942ff3cc874496b5bbe3c7.zip | |
Add SNIA to MISC-FREE license group, bug 441924.
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 0d7007962867..dffbd02bd7b4 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7151 2012/11/16 13:11:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7152 2012/11/16 15:17:06 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! + 16 Nov 2012; Ulrich Müller <ulm@gentoo.org> license_groups: + Add SNIA to MISC-FREE license group, bug 441924. + 16 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask: Lastrite metacity-python wrt #438894 diff --git a/profiles/license_groups b/profiles/license_groups index 2bdb76c63af6..4fc56f0036ab 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.139 2012/11/16 10:11:09 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.140 2012/11/16 15:17:06 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist # 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 BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL Subversion SVFL tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH +MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA Subversion SVFL 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. |