summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2012-08-09 15:17:27 +0000
committerLuca Barbato <lu_zero@gentoo.org>2012-08-09 15:17:27 +0000
commit109c7d698ad858a6dc67816df12aa9f3dbf9bf45 (patch)
treea99ff6070f69366bccdf5ef1dcec3551eb4782ea /profiles
parentFix nfs.initd typo. #428484 (diff)
downloadgentoo-2-109c7d698ad858a6dc67816df12aa9f3dbf9bf45.tar.gz
gentoo-2-109c7d698ad858a6dc67816df12aa9f3dbf9bf45.tar.bz2
gentoo-2-109c7d698ad858a6dc67816df12aa9f3dbf9bf45.zip
Add FraunhoferFDK license
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/license_groups4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d81f93b9b2cc..4c868a9a5162 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.6881 2012/08/08 16:16:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6882 2012/08/09 15:17:27 lu_zero 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!
+ 09 Aug 2012; Luca Barbato <lu_zero@gentoo.org> license_groups:
+ Add FraunhoferFDK license
+
08 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
Improve epdfview mask message again
diff --git a/profiles/license_groups b/profiles/license_groups
index 4d8d50fa6dc1..fded4613dcca 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.116 2012/08/07 18:51:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.117 2012/08/09 15:17:27 lu_zero 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.3 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 skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo yEd-1.1
+EULA AdobeFlash-10.3 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 skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm sun-prerelease-jdk6 sun-prerelease-jdk7 THINKTANKS ut2003 ut2003-demo yEd-1.1 FraunhoferFDK
# As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml
# Excerpt of the rules for this license group: