diff options
| -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 03265de39b52..fb428fb3d4b6 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.6198 2012/02/10 22:49:52 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6199 2012/02/11 03:59:19 miknix 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! + 11 Feb 2012; Angelo Arrifano <miknix@gentoo.org> license_groups: + Add Mendeley-EULA to EULA, needed for sci-misc/mendeleydesktop + 10 Feb 2012; Markos Chandras <hwoarang@gentoo.org> package.mask: Mask app-laptop/thinkpad and friends for removal. Bug #381263 diff --git a/profiles/license_groups b/profiles/license_groups index c6ef9342974a..f4ec2af0c0c9 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.102 2012/01/16 07:15:31 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.103 2012/02/11 03:59:19 miknix Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -46,7 +46,7 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER BitstreamVera CC-PD CCPL-Attribution-2.5 CCPL # and share modifications FREE @FREE-SOFTWARE @FREE-DOCUMENTS -EULA AdobeFlash-10 AdobeFlash-10.1 AdobeFlash-9.0.31.0 BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW google-chrome googleearth google-talkplugin IBM-J1.5 IBM-J1.6 Intel-SDP Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo +EULA Mendeley-EULA AdobeFlash-10 AdobeFlash-10.1 AdobeFlash-9.0.31.0 BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW google-chrome googleearth google-talkplugin IBM-J1.5 IBM-J1.6 Intel-SDP Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA SCM-MICRO skype-eula spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml # Excerpt of the rules for this license group: |