* citadel.schema: declared GPL v3

* rfc2739.schema: declared license identical to Kolab's distribution of this file

diff --git a/citadel/openldap/citadel.schema b/citadel/openldap/citadel.schema
index 3b928690c31b6764fe72d67e84c229b59d03db7c..682ff2cdf7e86b7ca0f40e944f9a897036594898 100644 (file)
--- a/citadel/openldap/citadel.schema
+++ b/citadel/openldap/citadel.schema
@@ -2,7 +2,7 @@
 
 # (c) 2006 Art Cancro <ajc@uncensored.citadel.org>
 
-# This file is distributed under the terms of the GNU General Public License v2.
+# This file is distributed under the terms of the GNU General Public License v3.
 
 # This schema depends on the core.schema, cosine.schema and the inetorgperson.schema
 # as provided by third parties such as OpenLDAP.  It also depends on rfc2739 schema,

diff --git a/citadel/openldap/rfc2739.schema b/citadel/openldap/rfc2739.schema
index 245805aca3deeb549219b7a4ff08ce77b81ee6f6..4232302af904ca96acd02ef67aed1a62d3fa5d8c 100644 (file)
--- a/citadel/openldap/rfc2739.schema
+++ b/citadel/openldap/rfc2739.schema
@@ -1,12 +1,48 @@
 # (c) 2004 Martin Konold <martin.konold@erfrakon.de>
 # (c) 2006 Art Cancro <ajc@uncensored.citadel.org>
 
-# This file is distributed under the terms of the GNU General Public License v2.
-
 # This schema is derived from RFC 2739 and may act as a substitute
-# when used with OpenLDAP, as the original schema from RFC 2739 
+# when used with OpenLDAP as the original schema from RFC 2739 
 # is syntactically not accepted by OpenLDAP 2.2.14
 
+# The version of this file as distributed in the Citadel upstream packages
+# contains text claiming copyright by the Internet Society and including
+# the IETF RFC license, which does not meet Debian's Free Software
+# Guidelines.  However, apart from short and obvious comments, the text of
+# this file is purely a functional interface specification, which is not
+# subject to that license and is not copyrightable under US law.
+#
+# The license statement is retained below so as not to remove credit, but
+# as best as we can determine, it is not applicable to the contents of
+# this file.
+
+# Copyright (C) The Internet Society (2000).  All Rights Reserved.
+#
+#  This document and translations of it may be copied and furnished to
+#  others, and derivative works that comment on or otherwise explain it
+#  or assist in its implementation may be prepared, copied, published
+#  and distributed, in whole or in part, without restriction of any
+#  kind, provided that the above copyright notice and this paragraph are
+#  included on all such copies and derivative works.  However, this
+#  document itself may not be modified in any way, such as by removing
+#  the copyright notice or references to the Internet Society or other
+#  Internet organizations, except as needed for the purpose of
+#  developing Internet standards in which case the procedures for
+#  copyrights defined in the Internet Standards process must be
+#  followed, or as required to translate it into languages other than
+#  English.
+#
+#  The limited permissions granted above are perpetual and will not be
+#  revoked by the Internet Society or its successors or assigns.
+#
+#  This document and the information contained herein is provided on an
+#  "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+#  TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+#  BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+#  HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+#  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
 # If you are using OpenLDAP, slapd.conf should declare schemas like this:
 #
 #  include /etc/openldap/schema/core.schema