diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2010-06-16 12:07:58 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2010-06-16 12:07:58 +0000 |
| commit | 73243694b646b439ef7eb008a2ff1148348af96f (patch) | |
| tree | f389fb08b57d6d18ba3b15d67ea84e7854949e8c | |
| parent | Reapply potfiles patch since upstream still didn't fix the issue. (diff) | |
| download | gentoo-2-73243694b646b439ef7eb008a2ff1148348af96f.tar.gz gentoo-2-73243694b646b439ef7eb008a2ff1148348af96f.tar.bz2 gentoo-2-73243694b646b439ef7eb008a2ff1148348af96f.zip | |
Adding AdobeFlash-10 and AdobeFlash10.1 to EULA license group (Bug #323837)
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index eb0e49cac287..44f6983813b4 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4277 2010/06/16 11:26:14 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4278 2010/06/16 12:07:58 lack 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! + 16 Jun 2010; Jim Ramsay <lack@gentoo.org> license_groups: + Adding AdobeFlash-10 and AdobeFlash10.1 to EULA license group (Bug + #323837) + 16 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org> package.mask: Masking sci-biology/mpiblast for QA removal. diff --git a/profiles/license_groups b/profiles/license_groups index 4831aefd80d3..36c9b95e4d7d 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 2007-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.41 2010/05/19 20:06:16 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.42 2010/06/16 12:07:58 lack Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -37,7 +37,7 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER BitstreamVera CC-PD CCPL-Attribution-3.0 CCPL # and share modifications FREE @FREE-SOFTWARE @FREE-DOCUMENTS -EULA BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW googleearth IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA skype-eula spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo +EULA BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW googleearth IBM-J1.5 IBM-J1.6 Introversion jrockit Livestation-EULA LOKI-EULA LRCTF MARBLEBLAST Nero-EULA-US Pando-EULA POMPOM postal2 PUEL Q3AEULA QUAKE4 RTCW RTCW-ETEULA skype-eula spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo AdobeFlash-10 AdobeFlash-10.1 # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml # Excerpt of the rules for this license group: |