From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 13 Nov 2011 09:39:16 +0000 (+0000)
Subject: Add MPL-1.0 to OSI-APPROVED: http://www.opensource.org/licenses/mozilla1.0
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d98592c0f0504e6ed1b1997d7896644b559f8629;p=gentoo.git

Add MPL-1.0 to OSI-APPROVED: opensource.org/licenses/mozilla1.0
---

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b520284cd3d7..3e604b91613f 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5898 2011/11/12 16:38:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5899 2011/11/13 09:39:16 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!
 
+  13 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups:
+  Add MPL-1.0 to OSI-APPROVED: http://www.opensource.org/licenses/mozilla1.0
+
   12 Nov 2011; Ulrich Mueller <ulm@gentoo.org> license_groups:
   Remove nauty from EULA group. This has previously been discussed in
   <http://archives.gentoo.org/gentoo-dev/
diff --git a/profiles/license_groups b/profiles/license_groups
index e602f939b2c3..4236be47551e 100644
--- 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.83 2011/11/12 16:38:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.84 2011/11/13 09:39:16 ulm Exp $
 
 # Please report bugs or other requests at bugs.gentoo.org and assign to
 # licenses@gentoo.org
@@ -14,7 +14,7 @@ GPL-COMPATIBLE AGPL-3 Apache-2.0 Artistic-2 as-is Boost-1.0 BSD BSD-2 CeCILL-2 C
 FSF-APPROVED @GPL-COMPATIBLE AFL-2.0 AFL-2.1 AFL-3.0 Apache-1.1 APSL-2 BitTorrent BSD-4 CDDL CNRI CPL-1.0 EPL-1.0 IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 SPL
 
 # http://www.opensource.org/licenses
-OSI-APPROVED AFL-3.0 AGPL-3 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 as-is Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-2 GPL-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 LPPL-1.3c MIT MPL-1.1 Ms-PL nethack NOSA OFL-1.1 OGTSL OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL SPL W3C wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
+OSI-APPROVED AFL-3.0 AGPL-3 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 as-is Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 DB EPL-1.0 EUPL-1.1 GPL-2 GPL-3 IBM IPAfont ISC LGPL-2.1 LGPL-3 LPPL-1.3c MIT MPL-1.0 MPL-1.1 Ms-PL nethack NOSA OFL-1.1 OGTSL OracleDB PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL SPL W3C wxWinLL-3 wxWinLL-3.1 ZLIB ZPL
 
 # Misc licenses that are probably free software, i.e. follow the
 # Free Software Definition at http://www.gnu.org/philosophy/free-sw.html