diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-12-18 06:15:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-12-18 06:15:06 +0000 |
| commit | 71918ef8b98a927ba9c6ceaeb22fedb684b79921 (patch) | |
| tree | 34466f685aed68e6d2ac81fece70718cac958033 /profiles | |
| parent | Change LICENSE=google-talkplugin to LICENSE=Google-TOS to reflect license/ re... (diff) | |
| download | gentoo-2-71918ef8b98a927ba9c6ceaeb22fedb684b79921.tar.gz gentoo-2-71918ef8b98a927ba9c6ceaeb22fedb684b79921.tar.bz2 gentoo-2-71918ef8b98a927ba9c6ceaeb22fedb684b79921.zip | |
Change google-talkplugin to Google-TOS to match licenses/ rename.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index d9d8925a1c35..72781536e777 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.7263 2012/12/17 08:46:35 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7264 2012/12/18 06:15:06 vapier 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! + 18 Dec 2012; Mike Frysinger <vapier@gentoo.org> license_groups: + Change google-talkplugin to Google-TOS to match licenses/ rename. + 17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask: Add gnome-system-log-3.6 to gnome-3.6 mask (bug #447476). diff --git a/profiles/license_groups b/profiles/license_groups index 71a93e68f02a..850793ada5bd 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.154 2012/12/16 22:42:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.155 2012/12/18 06:15:06 vapier 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 DOOM3 ETQW FraunhoferFDK google-chrome googleearth google-talkplugin 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 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 # As proposed: http://archives.gentoo.org/gentoo-dev/msg_6c950b46c50fe72ebc5e650bbf70f77c.xml # Excerpt of the rules for this license group: |