summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-02-29 13:02:26 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-02-29 13:02:26 +0000
commit96e611e391bc99f168de302c054880164d918912 (patch)
tree61862222aa0998a5b6af102d81f20966276f079f /profiles
parentVersion bump. (diff)
downloadhistorical-96e611e391bc99f168de302c054880164d918912.tar.gz
historical-96e611e391bc99f168de302c054880164d918912.tar.bz2
historical-96e611e391bc99f168de302c054880164d918912.zip
Update new Adobe licenses in EULA group.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/license_groups4
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 019cfdd5f848..1daea72d22b0 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6262 2012/02/29 07:55:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6263 2012/02/29 13:02:26 chithanh 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!
+ 29 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ license_groups:
+ Update new Adobe licenses in EULA group.
+
29 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Lastrite gnunet and gnunet-gtk.
diff --git a/profiles/license_groups b/profiles/license_groups
index 8eb68cc5c496..0af4f7f982c8 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.106 2012/02/24 21:48:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.107 2012/02/29 13:02:26 chithanh 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 Mendeley-EULA 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 AdobeFlash-10.3 AdobeFlash-11_beta 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 Mendeley-EULA 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: