diff options
-rw-r--r-- | profiles/ChangeLog | 5 | ||||
-rw-r--r-- | profiles/license_groups | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 56120d1883f1..826c6d358f4d 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.7086 2012/11/01 07:05:55 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7087 2012/11/01 09:22:41 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! + 01 Nov 2012; Ulrich Müller <ulm@gentoo.org> license_groups: + New DEPRECATED license group, bug 440638. + 01 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> package.mask: Unmask boost 1.50/1.51 to comply with glibc-2.16, as well as GnuTLS 3; keep libtasn1-3 masked, and give more details on the reason. diff --git a/profiles/license_groups b/profiles/license_groups index 2bb2d13f121d..4e2b8743fa08 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.133 2012/10/06 20:11:31 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.134 2012/11/01 09:22:41 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -60,6 +60,10 @@ EULA AdobeFlash-10.3 BCS Broadcom cadsoft DOOM3 ETQW FraunhoferFDK google-chrome # location compliant with the license, BINARY-REDISTRIBUTABLE @FREE adobe-ps atheros-hal intel-psb intel-ucode ipw2100-fw ipw2200-fw ipw3945 libertas-fw NVIDIA qlogic-fibre-channel-firmware radeon-ucode ralink-firmware SmartLabs +# Deprecated license labels, used by repoman +# as-is: see note in licenses/as-is and bug 436214 +DEPRECATED as-is + # Local Variables: # mode: conf-space # mode: visual-line |