svn commit: lorikeet r559 - in trunk/heimdal: .

abartlet at samba.org abartlet at samba.org
Fri Sep 1 06:54:33 GMT 2006


Author: abartlet
Date: 2006-09-01 06:54:33 +0000 (Fri, 01 Sep 2006)
New Revision: 559

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=559

Log:
Clarify the Heimdal licence, and use a file that can't be confused
with the standard GPL COPYING.

Andrew Bartlett

Added:
   trunk/heimdal/HEIMDAL-LICENCE.txt
Removed:
   trunk/heimdal/COPYING


Changeset:
Deleted: trunk/heimdal/COPYING
===================================================================
--- trunk/heimdal/COPYING	2006-07-03 00:14:41 UTC (rev 558)
+++ trunk/heimdal/COPYING	2006-09-01 06:54:33 UTC (rev 559)
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan and others.
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
- *
- * See individual files for each copyright notice.  Also note that
- * this Samba4 MODIFIED VERSION may depend on GPL'ed libraries.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 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. Neither the name of the Institute nor the names of its contributors 
- *    may be used to endorse or promote products derived from this software 
- *    without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON 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 DAMAGE. 
- */
-

Copied: trunk/heimdal/HEIMDAL-LICENCE.txt (from rev 555, trunk/heimdal/COPYING)
===================================================================
--- trunk/heimdal/COPYING	2006-06-06 04:52:31 UTC (rev 555)
+++ trunk/heimdal/HEIMDAL-LICENCE.txt	2006-09-01 06:54:33 UTC (rev 559)
@@ -0,0 +1,45 @@
+This is a copy of the standard copyright notice on most files in the
+heimdal tree. This license is confidered to be GPL compatible by the
+Free Software Foundation (see http://www.fsf.org/licensing/licenses/index_html#GPLCompatibleLicenses)
+
+Note that the list of copyright holders varies between the individial
+files. Also note that this Samba4 MODIFIED VERSION may depend on GPL'ed
+libraries.
+
+Many thanks to the Heimdal developers for their support and
+cooperation in the use of the heimdal code in Samba.
+
+
+/*
+ * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan and others.
+ * (Royal Institute of Technology, Stockholm, Sweden). 
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 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. Neither the name of the Institute nor the names of its contributors 
+ *    may be used to endorse or promote products derived from this software 
+ *    without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON 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 DAMAGE. 
+ */
+



More information about the samba-cvs mailing list