diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-05-29 20:08:06 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-05-29 20:08:06 +0000 |
| commit | 74ecdc37681110d536ce1b4aadfc691e543eab68 (patch) | |
| tree | 20f2bc2f0cec5284394e6661fabb5c925d4f1709 /profiles/license_groups | |
| parent | Update Debian patchset, fixes bug 550628. (diff) | |
| download | historical-74ecdc37681110d536ce1b4aadfc691e543eab68.tar.gz historical-74ecdc37681110d536ce1b4aadfc691e543eab68.tar.bz2 historical-74ecdc37681110d536ce1b4aadfc691e543eab68.zip | |
Reorder license groups, and try to define what an EULA is.
Diffstat (limited to 'profiles/license_groups')
| -rw-r--r-- | profiles/license_groups | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/profiles/license_groups b/profiles/license_groups index efc60d40c909..64d900301ca3 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.264 2015/05/29 19:32:17 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.265 2015/05/29 20:08:06 ulm Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -60,8 +60,6 @@ FREE-DOCUMENTS @FSF-APPROVED-OTHER @MISC-FREE-DOCS # and share modifications FREE @FREE-SOFTWARE @FREE-DOCUMENTS -EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA cadsoft Coherent-Graphics CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS IBM-J1.6 Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 RTCW RTCW-ETEULA SCM-MICRO SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi - # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml # Excerpt of the rules for this license group: # - MUST permit redistribution in binary form @@ -74,6 +72,12 @@ EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnx # in a file location compliant with the license BINARY-REDISTRIBUTABLE @FREE atheros-hal bh-luxi Broadcom Dina hashcat intel-ucode ipw2100-fw ipw2200-fw ipw3945 no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware radeon-ucode shmux SmartLabs sun-concurrent-util sun-jlfgr +###################################################################### + +# License agreements that try to take away your rights. These are more +# restrictive than "all-rights-reserved" or require explicit approval. +EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA cadsoft Coherent-Graphics CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS IBM-J1.6 Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 RTCW RTCW-ETEULA SCM-MICRO SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational sun-bcla-java-vm TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi + # Deprecated license labels, used by repoman #DEPRECATED as-is |