summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-09-28 15:03:00 +0000
committerUlrich Müller <ulm@gentoo.org>2012-09-28 15:03:00 +0000
commit1794ac6fc37017751f5d34c181b57fa5324b9d1a (patch)
treec1c9199f3eb519468e78d281c24d4cbe5678fac8 /profiles
parentFix Manifest to allow newer tarball with same name but without the compiled s... (diff)
downloadgentoo-2-1794ac6fc37017751f5d34c181b57fa5324b9d1a.tar.gz
gentoo-2-1794ac6fc37017751f5d34c181b57fa5324b9d1a.tar.bz2
gentoo-2-1794ac6fc37017751f5d34c181b57fa5324b9d1a.zip
Add libpng and rc to MISC-FREE license 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 ddd4182b18ba..5e3b1c1c0718 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.6993 2012/09/27 19:28:37 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6994 2012/09/28 15:03:00 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!
+ 28 Sep 2012; Ulrich Müller <ulm@gentoo.org> license_groups:
+ Add libpng and rc to MISC-FREE license group.
+
27 Sep 2012; Ralph Sennhauser <sera@gentoo.org> package.mask:
Drop mask for javacc-5.0. #315557
diff --git a/profiles/license_groups b/profiles/license_groups
index f94481e8441b..51b1a802de81 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.126 2012/09/26 05:13:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.127 2012/09/28 15:03:00 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 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 iASL icu IDPL imagemagick Info-ZIP ipadic JamesClark JasPer2.0 jaxen JDOM JNIC JOVE LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL Subversion tcp_wrappers_license TeX UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR 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 iASL icu IDPL imagemagick Info-ZIP ipadic JamesClark 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 PBZIP2 perforce PHP-2.02 Princeton pysqlite rc RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL Subversion tcp_wrappers_license TeX UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.