Rename EPL to ErlPL-1.1, in order to avoid confusion with the Eclipse Public License...

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8933821665aa4211e7c3fca8abe5571a22e1cd26..81ae5583e5fd30e6c01d1e2bf6da9d936919bc61 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5991 2011/12/06 23:08:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5992 2011/12/07 17:35:44 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!
 
+  07 Dec 2011; Ulrich Mueller <ulm@gentoo.org> license_groups:
+  Rename EPL to ErlPL-1.1, in order to avoid confusion with the Eclipse Public
+  License, bug 389705.
+
   06 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
   Unmask calligra-2.3.84
 

diff --git a/profiles/license_groups b/profiles/license_groups
index 2df971c06b52ad1b4541d0d86d6582d768f40563..b4e7280d1025ec4c4415ba5595599fa9ccf85b6e 100644 (file)
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.92 2011/12/06 19:56:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.93 2011/12/07 17:35:44 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -23,7 +23,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 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL FastCGI FLEX FLTK FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib mplus-fonts NCSA-HDF 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 CC0-1.0-Universal CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp dom4j eGenixPublic-1.1 ElementTree Emacs EPL ErlPL-1.1 FastCGI FLEX FLTK FVWM gnuplot gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP JamesClark JasPer2.0 jaxen JDOM JNIC LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib mplus-fonts NCSA-HDF 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
 # The following are NOT valid in @MISC-FREE:
 # arj - usage restrictions
 # freedist - Doesn't grant the right to do modifications.