summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-08-27 19:16:56 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-08-27 19:16:56 +0000
commit0941998c9d457b514b4a05190caac380d4d0a1fb (patch)
tree76d7514620ac8625f2747687ff1978786c1b554c /profiles
parentStable for PPC (bug #333511). (diff)
downloadhistorical-0941998c9d457b514b4a05190caac380d4d0a1fb.tar.gz
historical-0941998c9d457b514b4a05190caac380d4d0a1fb.tar.bz2
historical-0941998c9d457b514b4a05190caac380d4d0a1fb.zip
Bug #333143: Add "kilgard" license for media-libs/mesa Debian DFSG debate.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/license_groups6
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index a511a8615332..816107db28f2 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4505 2010/08/27 15:42:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4506 2010/08/27 19:16:56 robbat2 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!
+ 27 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> license_groups:
+ Bug #333143: Add "kilgard" license for media-libs/mesa Debian DFSG debate.
+
27 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> package.mask:
Masking dev-libs/pcl for QA removal.
diff --git a/profiles/license_groups b/profiles/license_groups
index 7be6b778316e..25a91fc1bebc 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
-# Copyright 2007-2010 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.47 2010/08/26 19:12:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.48 2010/08/27 19:16:56 robbat2 Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -22,7 +22,7 @@ OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2
# term these should be cleared up and moved to other sets.
# 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 ANTLR BEER-WARE BZIP2 CC0-1.0-Universal CDDL-Schily CMake CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs FastCGI FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH
+MISC-FREE ANTLR BEER-WARE BZIP2 CC0-1.0-Universal CDDL-Schily CMake CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs FastCGI FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH kilgard
# Metaset for all free software
FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE