[gentoo-commits] repo/gentoo:master commit in: licenses/

[Ulrich Müller]

commit:     8d5ebd62247a3b5c6d29e5cf41d74ac27ec9b51d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 10:40:54 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 10:40:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5ebd62

licenses: Restore mangled CVS keywords from the original upstream files.

 licenses/GPL-2-with-MySQL-FLOSS-exception | 12 ++---
 licenses/Opendylan                        |  5 +-
 licenses/Sendmail                         |  2 +
 licenses/Sendmail-Open-Source             |  2 +
 licenses/Stuffit                          |  3 +-
 licenses/URI                              |  2 +-
 licenses/W3C-document                     | 77 +++++++++++++++----------------
 licenses/codehaus-classworlds             | 18 ++++----
 licenses/lcc                              |  1 +
 9 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/licenses/GPL-2-with-MySQL-FLOSS-exception b/licenses/GPL-2-with-MySQL-FLOSS-exception
index 3bc909329b..b8a930ae2b 100644
--- a/licenses/GPL-2-with-MySQL-FLOSS-exception
+++ b/licenses/GPL-2-with-MySQL-FLOSS-exception
@@ -8,7 +8,7 @@ Exception Intent
 We want specified Free/Libre and Open Source Software ("FLOSS") applications
 to be able to use specified GPL-licensed MySQL client libraries (the
 "Program") despite the fact that not all FLOSS licenses are compatible with
-version 2 of the GNU General Public License (the "GPL"). 
+version 2 of the GNU General Public License (the "GPL").
 
 
 Legal Terms and Conditions
@@ -22,7 +22,7 @@ GPL:
     a. You obey the GPL in all respects for the Program and the Derivative
        Work, except for identifiable sections of the Derivative Work which
        are not derived from the Program, and which can reasonably be
-       considered independent and separate works in themselves, 
+       considered independent and separate works in themselves,
 
     b. all identifiable sections of the Derivative Work which are not
        derived from the Program, and which can reasonably be considered
@@ -30,7 +30,7 @@ GPL:
 
         (i) are distributed subject to one of the FLOSS licenses listed
             below, and
-           
+
        (ii) the object code or executable form of those sections are
             accompanied by the complete corresponding machine-readable
             source code for those sections on the same medium and under the
@@ -94,9 +94,9 @@ the FLOSS Exception notice from that work and comply with the GPL in all
 respects, including by retaining all GPL notices.  You may choose to
 redistribute a copy of the Program exclusively under the terms of the GPL by
 removing the FLOSS Exception notice from that copy of the Program, provided
-that the copy has never been modified by you or any third party.  
+that the copy has never been modified by you or any third party.
 
-$Id$
+$Id: FLOSS-exception.txt,v 1.5 2004/07/15 15:24:19 z Exp $
 
 			GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
@@ -438,5 +438,3 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
-
-

diff --git a/licenses/Opendylan b/licenses/Opendylan
index 8416fb0a53..5e4ffa102b 100644
--- a/licenses/Opendylan
+++ b/licenses/Opendylan
@@ -53,7 +53,7 @@ accompanying software that uses this software.  The source code must
 either be included in the distribution or be available for no more than
 the cost of distribution plus a nominal fee, and must be freely
 redistributable under reasonable conditions.  For an executable file,
-complete source code means the source code for all modules it contains. 
+complete source code means the source code for all modules it contains.
 It does not include source code for modules or files that typically
 accompany the major components of the operating system on which the
 executable file runs.
@@ -72,5 +72,4 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ---
 
-$Id$
-
+$Id: //info.ravenbrook.com/project/mps/master/license.txt#2 $

diff --git a/licenses/Sendmail b/licenses/Sendmail
index 91ae47fddc..e466568a22 100644
--- a/licenses/Sendmail
+++ b/licenses/Sendmail
@@ -75,3 +75,5 @@ each of the following conditions is met:
    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+$Revision: 8.11 $, Last updated $Date: 2002/04/24 22:26:56 $

diff --git a/licenses/Sendmail-Open-Source b/licenses/Sendmail-Open-Source
index a7efa04ca2..81fc539256 100644
--- a/licenses/Sendmail-Open-Source
+++ b/licenses/Sendmail-Open-Source
@@ -73,3 +73,5 @@ permitted only if each of the following conditions of 1-6 are met:
    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    WITHOUT LIMITATION NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+$Revision: 1.1 $ $Date: 2004/06/01 18:16:20 $

diff --git a/licenses/Stuffit b/licenses/Stuffit
index 0bdcf84930..aa2fab9a3c 100644
--- a/licenses/Stuffit
+++ b/licenses/Stuffit
@@ -56,5 +56,4 @@ Server, multiple user and site licenses are available, please visit:
 
 or contact: sales@××××××××××.com
 
-$Id$
-
+$Id: LICENSE,v 1.6 2001/06/28 22:37:33 serge Exp $

diff --git a/licenses/URI b/licenses/URI
index a368e51e95..7580200ae4 100644
--- a/licenses/URI
+++ b/licenses/URI
@@ -1,5 +1,5 @@
 
-  $Id$
+  $Id: COPYRIGHT_URI 11906 2005-08-08 19:51:43Z root $
 
   (c) Copyright 1994-2000 by
   The University of Rhode Island and The Massachusetts Institute of Technology

diff --git a/licenses/W3C-document b/licenses/W3C-document
index 1b1879149e..0339915701 100644
--- a/licenses/W3C-document
+++ b/licenses/W3C-document
@@ -1,66 +1,65 @@
 W3C® DOCUMENT LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
 
-Public documents on the W3C site are provided by the copyright holders under the 
-following license. By using and/or copying this document, or the W3C document 
-from which this statement is linked, you (the licensee) agree that you have 
+Public documents on the W3C site are provided by the copyright holders under the
+following license. By using and/or copying this document, or the W3C document
+from which this statement is linked, you (the licensee) agree that you have
 read, understood, and will comply with the following terms and conditions:
 
-Permission to copy, and distribute the contents of this document, or the W3C 
-document from which this statement is linked, in any medium for any purpose and 
-without fee or royalty is hereby granted, provided that you include the 
+Permission to copy, and distribute the contents of this document, or the W3C
+document from which this statement is linked, in any medium for any purpose and
+without fee or royalty is hereby granted, provided that you include the
 following on ALL copies of the document, or portions thereof, that you use:
 
    1. A link or URL to the original W3C document.
-   2. The pre-existing copyright notice of the original author, or if it doesn't 
-exist, a notice (hypertext is preferred, but a textual representation is 
-permitted) of the form: "Copyright © [$date-of-document] World Wide Web 
-Consortium, (Massachusetts Institute of Technology, European Research Consortium 
-for Informatics and Mathematics, Keio University). All Rights Reserved. 
+   2. The pre-existing copyright notice of the original author, or if it doesn't
+exist, a notice (hypertext is preferred, but a textual representation is
+permitted) of the form: "Copyright © [$date-of-document] World Wide Web
+Consortium, (Massachusetts Institute of Technology, European Research Consortium
+for Informatics and Mathematics, Keio University). All Rights Reserved.
 http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231"
    3. If it exists, the STATUS of the W3C document.
 
-When space permits, inclusion of the full text of this NOTICE should be 
-provided. We request that authorship attribution be provided in any software, 
-documents, or other items or products that you create pursuant to the 
+When space permits, inclusion of the full text of this NOTICE should be
+provided. We request that authorship attribution be provided in any software,
+documents, or other items or products that you create pursuant to the
 implementation of the contents of this document, or any portion thereof.
 
-No right to create modifications or derivatives of W3C documents is granted 
-pursuant to this license. However, if additional requirements (documented in the 
-Copyright FAQ) are satisfied, the right to create modifications or derivatives 
-is sometimes granted by the W3C to individuals complying with those 
+No right to create modifications or derivatives of W3C documents is granted
+pursuant to this license. However, if additional requirements (documented in the
+Copyright FAQ) are satisfied, the right to create modifications or derivatives
+is sometimes granted by the W3C to individuals complying with those
 requirements.
 
-THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; 
-THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE 
-IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE;
+THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
 COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
 
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE 
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE
 OR IMPLEMENTATION OF THE CONTENTS THEREOF.
 
-The name and trademarks of copyright holders may NOT be used in advertising or 
-publicity pertaining to this document or its contents without specific, written 
-prior permission. Title to copyright in this document will at all times remain 
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to this document or its contents without specific, written
+prior permission. Title to copyright in this document will at all times remain
 with copyright holders.
 
 ----------------------------------------------------------------------------
 
-This formulation of W3C's notice and license became active on December 31 2002. 
-This version removes the copyright ownership notice such that this license can 
-be used with materials other than those owned by the W3C, moves information on 
-style sheets, DTDs, and schemas to the Copyright FAQ, reflects that ERCIM is now 
-a host of the W3C, includes references to this specific dated version of the 
-license, and removes the ambiguous grant of "use". See the older formulation for 
-the policy prior to this date. Please see our Copyright FAQ for common questions 
-about using materials from our site, such as the translating or annotating 
-specifications. Other questions about this notice can be directed to 
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, moves information on
+style sheets, DTDs, and schemas to the Copyright FAQ, reflects that ERCIM is now
+a host of the W3C, includes references to this specific dated version of the
+license, and removes the ambiguous grant of "use". See the older formulation for
+the policy prior to this date. Please see our Copyright FAQ for common questions
+about using materials from our site, such as the translating or annotating
+specifications. Other questions about this notice can be directed to
 site-policy@××.org.
 
 Joseph Reagle <site-policy@××.org>
 
-Last revised $Id$
-slesch Exp $
+$Id: copyright-documents-20021231.html,v 1.6 2004/07/06 16:02:49 slesch Exp $

diff --git a/licenses/codehaus-classworlds b/licenses/codehaus-classworlds
index a8e9a986f6..c1db5a79e1 100644
--- a/licenses/codehaus-classworlds
+++ b/licenses/codehaus-classworlds
@@ -1,10 +1,10 @@
 
 
 /*
- $Id$
+ $Id: LICENSE.txt,v 1.1.1.1 2003/07/29 04:37:59 bob Exp $
 
  Copyright 2002 (C) The Codehaus. All Rights Reserved.
- 
+
  Redistribution and use of this software and associated documentation
  ("Software"), with or without modification, are permitted provided
  that the following conditions are met:
@@ -12,25 +12,25 @@
  1. Redistributions of source code must retain copyright
     statements and notices.  Redistributions must also contain a
     copy of this document.
- 
+
  2. Redistributions in binary form must reproduce the
     above copyright notice, this list of conditions and the
     following disclaimer in the documentation and/or other
     materials provided with the distribution.
- 
+
  3. The name "classworlds" must not be used to endorse or promote
     products derived from this Software without prior written
-    permission of The Codehaus.  For written permission, please 
+    permission of The Codehaus.  For written permission, please
     contact bob@××××××××.org.
- 
+
  4. Products derived from this Software may not be called "classworlds"
     nor may "classworlds" appear in their names without prior written
     permission of The Codehaus. "classworlds" is a registered
     trademark of The Codehaus.
- 
+
  5. Due credit should be given to The Codehaus.
     (http://classworlds.codehaus.org/).
- 
+
  THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -43,5 +43,5 @@
  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+
  */

diff --git a/licenses/lcc b/licenses/lcc
index 2fc92d7bc1..5296699082 100644
--- a/licenses/lcc
+++ b/licenses/lcc
@@ -58,3 +58,4 @@ available; for more information, contact
 -----
 Chris Fraser / cwfraser@×××××××××.com
 David Hanson / drh@×××××××××.com
+$Revision: 145 $ $Date: 2001-10-17 16:53:10 -0500 (Wed, 17 Oct 2001) $