summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-02-21 21:57:08 +0000
committerUlrich Müller <ulm@gentoo.org>2013-02-21 21:57:08 +0000
commit85641b5dce887e42933af554102ead48c61945b1 (patch)
treebc8fd2310f161b467971e619130aa4d97df47155 /profiles
parentStable for ppc, wrt bug #458188 (diff)
downloadgentoo-2-85641b5dce887e42933af554102ead48c61945b1.tar.gz
gentoo-2-85641b5dce887e42933af554102ead48c61945b1.tar.bz2
gentoo-2-85641b5dce887e42933af554102ead48c61945b1.zip
Remove Scintilla license (duplicate of HPND) from MISC-FREE group.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/license_groups4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 360b5c90ec5f..50a74e20d1a2 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.7514 2013/02/21 09:56:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7515 2013/02/21 21:57:08 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!
+ 21 Feb 2013; Ulrich Müller <ulm@gentoo.org> license_groups:
+ Remove Scintilla license (duplicate of HPND) from MISC-FREE group.
+
21 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> license_groups:
Replace pngquant with rwpng license in the MISC-FREE group.
diff --git a/profiles/license_groups b/profiles/license_groups
index 314ae0f180a3..ad2f3a6b0460 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.193 2013/02/21 09:56:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.194 2013/02/21 21:57:08 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 alternate ANTLR bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CFS CMake CPL-0.5 CRACKLIB cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh Flashpix FLEX flexmock FLTK freemarker FVWM gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof mapm-4.9.5 matplotlib md2k7-asyouwish minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb npm Old-MIT openafs-krb5-a OpenSoftware Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils pysqlite qmail-nelson rc regexp-UofT RSA rwpng Scintilla Sendmail shrimp skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-modules tm-align w3m wxWinLL-3 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH
+MISC-FREE Allegro alternate ANTLR bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 CDDL-Schily CeCILL-C CFS CMake CPL-0.5 CRACKLIB cryptopp czyborra DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh Flashpix FLEX flexmock FLTK freemarker FVWM gd gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LIBGLOSS libmng libodialog libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof mapm-4.9.5 matplotlib md2k7-asyouwish minpack MIT-with-advertising mm mpich2 nap NCSA-HDF netcat NEWLIB ngrep noweb npm Old-MIT openafs-krb5-a OpenSoftware Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils pysqlite qmail-nelson rc regexp-UofT RSA rwpng Sendmail shrimp skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tablelist tcltk tcp_wrappers_license TermReadKey TeX TeX-other-free Time-modules tm-align w3m wxWinLL-3 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.