diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-14 17:23:57 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-14 17:23:57 +0000 |
commit | cf9c320f897e245f34e30727edf961315aaabda7 (patch) | |
tree | 31c607a441047508eb99a72d178f700690660063 /profiles | |
parent | Version bump wrt #421115 by Justin Lecher. Print pkg_postinst() warning for m... (diff) | |
download | historical-cf9c320f897e245f34e30727edf961315aaabda7.tar.gz historical-cf9c320f897e245f34e30727edf961315aaabda7.tar.bz2 historical-cf9c320f897e245f34e30727edf961315aaabda7.zip |
Include skype-4.0.0.7-copyright in EULA and skype-4.0.0.7-third-party_attributions.txt in MISC-FREE.
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/ChangeLog | 6 | ||||
-rw-r--r-- | profiles/license_groups | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 9797b421e489..a3c79dd4cf34 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.6669 2012/06/14 17:00:26 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6670 2012/06/14 17:23:57 ssuominen 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! + 14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> license_groups: + Include skype-4.0.0.7-copyright in EULA and + skype-4.0.0.7-third-party_attributions.txt in MISC-FREE. + 14 Jun 2012; Ben de Groot <yngwin@gentoo.org> package.mask: Add dev-embedded/qvfb to qt mask diff --git a/profiles/license_groups b/profiles/license_groups index a7f0f2aee668..10b3a92eb5e7 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.110 2012/04/27 15:38:51 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.111 2012/06/14 17:23:57 ssuominen Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation? # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath -MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP ipadic JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib mplus-fonts NCSA-HDF noweb OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug zpaq ZSH +MISC-FREE Allegro ANTLR bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP ipadic JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib mplus-fonts NCSA-HDF noweb OpenSoftware otter PBZIP2 perforce PHP-2.02 Princeton pysqlite RSA-MD4 RSA-MD5 saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL Subversion tcp_wrappers_license TeX UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug zpaq ZSH # The following are NOT valid in @MISC-FREE: # arj - usage restrictions # freedist - Doesn't grant the right to do modifications. @@ -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 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 # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml # Excerpt of the rules for this license group: |