summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-01-25 21:02:51 +0000
committerUlrich Müller <ulm@gentoo.org>2010-01-25 21:02:51 +0000
commit306fa0b88f22ab99697d03411209357ea660c8e0 (patch)
treef2a1ae29557ce39baf50ee4de347ab6e9b86b2d9 /profiles
parentRemove old. (diff)
downloadgentoo-2-306fa0b88f22ab99697d03411209357ea660c8e0.tar.gz
gentoo-2-306fa0b88f22ab99697d03411209357ea660c8e0.tar.bz2
gentoo-2-306fa0b88f22ab99697d03411209357ea660c8e0.zip
Add FVWM to MISC-FREE, bug 302139.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/license_groups6
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 99f552a22728..9c6df8194ea4 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3836 2010/01/25 12:22:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3837 2010/01/25 21:02:51 ulm 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!
+ 25 Jan 2010; Ulrich Mueller <ulm@gentoo.org> license_groups:
+ Add FVWM to MISC-FREE, bug 302139.
+
25 Jan 2010; Alexis Ballier <aballier@gentoo.org> arch/alpha/ChangeLog,
arch/alpha/package.mask, arch/arm/ChangeLog, +arch/arm/package.mask,
arch/hppa/ChangeLog, arch/hppa/package.mask, arch/ia64/ChangeLog,
diff --git a/profiles/license_groups b/profiles/license_groups
index 202c149c5b06..1edc84cc8edd 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
# Copyright 2007-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.30 2010/01/25 04:20:10 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.31 2010/01/25 21:02:51 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -20,7 +20,7 @@ OSI-APPROVED AFL-3.0 Apache-2.0 APL-1.0 Artistic Artistic-2 Boost-1.0 BSD BSD-2
# Free Software Definition at http://www.gnu.org/philosophy/free-sw.html
# but are not approved by either FSF or OSI. Preferably on the long
# term these should be cleared up and moved to other sets.
-MISC-FREE ANTLR BEER-WARE BZIP2 CDDL-Schily CMake CRACKLIB cryptopp eGenixPublic-1.1 ElementTree Emacs FLEX FLTK gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm IDPL imagemagick Info-ZIP JamesClark JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH
+MISC-FREE ANTLR BEER-WARE BZIP2 CDDL-Schily CMake CRACKLIB cryptopp eGenixPublic-1.1 ElementTree Emacs FLEX FLTK FVWM gnuplot GPL-2-with-exceptions GPL-2-with-linking-exception gsm IDPL imagemagick Info-ZIP JamesClark JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3c lsof MaxMind No-Problem-Bugroff OpenSoftware otter PBZIP2 PDFLite PHP-3 POSTGRESQL Princeton pysqlite RSA-MD4 RSA-MD5 Scintilla Sendmail SMAIL Subversion tcp_wrappers_license TeX w3m wxWinLL-3 Xdebug ZSH
# Metaset for all free software
FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -49,4 +49,4 @@ EULA BCS Broadcom cadsoft dlj-1.1 DOOM3 ETQW IBM-J1.4 IBM-J1.5 IBM-J1.6 Introver
# - IFF there is an explicit inclusion requirement, USE=bindist
# MUST cause a copy of the license to be installed in a file
# location compliant with the license,
-BINARY-REDISTRIBUTABLE @FREE Adaptec adobe-ps atheros-hal Intel intel-psb ipw2100-fw ipw2200-fw NVIDIA qlogic-fibre-channel-firmware ralink-firmware
+BINARY-REDISTRIBUTABLE @FREE Adaptec adobe-ps atheros-hal intel-psb ipw2100-fw ipw2200-fw NVIDIA qlogic-fibre-channel-firmware ralink-firmware