[Pkg-citadel-commit] r283 - citadel/trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2009-03-12 10:34:19 +0000 (Thu, 12 Mar 2009)
New Revision: 283

Modified:
   citadel/trunk/debian/changelog
   citadel/trunk/debian/copyright
Log:
Reworked copyright file.



Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2009-03-12 09:05:57 UTC (rev 282)
+++ citadel/trunk/debian/changelog	2009-03-12 10:34:19 UTC (rev 283)
@@ -2,6 +2,7 @@
 
   * New upstream version.
   * Added debug package.
+  * Reworked copyright file, closes: #518485
 
  -- Michael Meskes <meskes at debian.org>  Thu, 12 Mar 2009 10:06:00 +0100
 

Modified: citadel/trunk/debian/copyright
===================================================================
--- citadel/trunk/debian/copyright	2009-03-12 09:05:57 UTC (rev 282)
+++ citadel/trunk/debian/copyright	2009-03-12 10:34:19 UTC (rev 283)
@@ -25,9 +25,9 @@
    Steve Williams
    Ethan Young
 
-Copyright: (C) 1987-2006 Citadel development team
+Copyright: (C) 1987-2009 Citadel development team
 
-Copyright for CRC16: (C) 2002-2003 Indigo Systems Corporation
+Copyright for CRC16: (C) 1996-2003 Indigo Systems Corporation
 
 Copyright for MD5 implementation: (C) 1993 Colin Plumb
 
@@ -71,6 +71,17 @@
 
 RFC 2739 openldap schema license:
 
+   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.
+
    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
@@ -99,8 +110,7 @@
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 3 of the License.
 
    This package is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -125,7 +135,7 @@
 * files in the program, then also delete it here.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
-The Debian packaging is (C) 2006-2008, Debian Citadel Team <pkg-citadel-devel at lists.alioth.debian.org> and
+The Debian packaging is (C) 2006-2009, Debian Citadel Team <pkg-citadel-devel at lists.alioth.debian.org> and
 is licensed under the GPL, see above.