diff options
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index f59b590e56fb..b520284cd3d7 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5897 2011/11/12 16:34:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5898 2011/11/12 16:38:39 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! + 12 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups: + Remove nauty from EULA group. This has previously been discussed in + <http://archives.gentoo.org/gentoo-dev/ + msg_8da5109782ab2cbd717c1ea6c7a622e1.xml>. + 12 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> package.mask: Lastrite wxGTK and wxpython 2.6 wrt #330683 diff --git a/profiles/license_groups b/profiles/license_groups index 3f8a2c18d39d..e602f939b2c3 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.82 2011/11/12 12:35:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.83 2011/11/12 16:38:39 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -44,7 +44,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 MARBLEBLAST nauty Nero-EULA-US Nero-AAC-EULA 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 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 MARBLEBLAST Nero-EULA-US Nero-AAC-EULA 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: |