summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-02-20 17:01:52 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-02-20 17:01:52 +0000
commit247f6341dd5bd67a2d89f99383599ccfbb693920 (patch)
treedab6051e8bfd7cddd30411b2911cdb1ac8b9f687 /profiles
parentUnmask sssd-1.9.4-r1 (diff)
downloadgentoo-2-247f6341dd5bd67a2d89f99383599ccfbb693920.tar.gz
gentoo-2-247f6341dd5bd67a2d89f99383599ccfbb693920.tar.bz2
gentoo-2-247f6341dd5bd67a2d89f99383599ccfbb693920.zip
add TeamViewer license to @EULA
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 164cb9a493d0..67f856c206cb 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7508 2013/02/20 16:49:35 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7509 2013/02/20 17:01:52 hasufell 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!
+ 20 Feb 2013; Julian Ospald <hasufell@gentoo.org> license_groups:
+ add TeamViewer license to @EULA
+
20 Feb 2013; Maxim Koltsov <maksbotan@gentoo.org> package.mask:
Unmask sssd-1.9.4-r1
diff --git a/profiles/license_groups b/profiles/license_groups
index 7884ba96f8d0..9158a140650f 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.190 2013/02/18 07:41:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.191 2013/02/20 17:01:52 hasufell Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -59,7 +59,7 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER @MISC-FREE-DOCS
# and share modifications
FREE @FREE-SOFTWARE @FREE-DOCUMENTS
-EULA AdobeFlash-10.3 AdobeFlash-11.x BCS Broadcom cadsoft DOOM3 ETQW FraunhoferFDK google-chrome googleearth Google-TOS IBM-J1.5 IBM-J1.6 Intel-SDP Introversion Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-EULA MSjdbcEULA40 Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE 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 THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo
+EULA AdobeFlash-10.3 AdobeFlash-11.x BCS Broadcom cadsoft DOOM3 ETQW FraunhoferFDK google-chrome googleearth Google-TOS IBM-J1.5 IBM-J1.6 Intel-SDP Introversion Livestation-EULA LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-EULA MSjdbcEULA40 Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE 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 TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo
# As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml
# Excerpt of the rules for this license group: