[Pkg-silc-commits] r175 - /silc-server/trunk/debian/copyright

[lunar at users.alioth.debian.org]

Author: lunar
Date: Tue Sep 25 20:11:48 2007
New Revision: 175

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=175
Log:
Fix debian/copyright issues mentioned by ftpmaster.

Modified:
    silc-server/trunk/debian/copyright

Modified: silc-server/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/copyright?rev=175&op=diff
==============================================================================
--- silc-server/trunk/debian/copyright (original)
+++ silc-server/trunk/debian/copyright Tue Sep 25 20:11:48 2007
@@ -36,8 +36,8 @@
 
     Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson
 
-    Licensed under the GNU General Public License, version 2.1 or any later
-    version.
+    Licensed under the GNU Lesser General Public License, version 2.1 or any
+    later version.
 
   * lib/contrib/regexpr.c,
     lib/contrib/regexpr.h:
@@ -54,14 +54,44 @@
 
     Copyright (C) 1998-2006 Brian Gladman
 
-    Licensed under the GNU General Public License.
+    The free distribution and use of this software in both source and binary
+    form is allowed (with or without changes) provided that:
+
+      1. distributions of this source code include the above copyright
+         notice, this list of conditions and the following disclaimer;
+
+      2. distributions in binary form include the above copyright
+         notice, this list of conditions and the following disclaimer
+         in the documentation and/or other associated materials;
+
+      3. the copyright holder's name is not used to endorse products
+         built using this software without specific written permission.
+
+    ALTERNATIVELY, provided that this notice is retained in full, this product
+    may be distributed under the terms of the GNU General Public License (GPL),
+    in which case the provisions of the GPL apply INSTEAD OF those given above.
   
   * lib/silccrypt/aes_x86.asm,
     lib/silccrypt/aes_x86_64.asm:
 
     Copyright (C) 2002 Brian Gladman
 
-    Licensed under the GNU General Public License.
+    The free distribution and use of this software in both source and binary
+    form is allowed (with or without changes) provided that:
+
+      1. distributions of this source code include the above copyright
+         notice, this list of conditions and the following disclaimer;
+
+      2. distributions in binary form include the above copyright
+         notice, this list of conditions and the following disclaimer
+         in the documentation and/or other associated materials;
+
+      3. the copyright holder's name is not used to endorse products
+         built using this software without specific written permission.
+
+    ALTERNATIVELY, provided that this notice is retained in full, this product
+    may be distributed under the terms of the GNU General Public License (GPL),
+    in which case the provisions of the GPL apply INSTEAD OF those given above.
 
   * lib/silccrypt/blowfish.c: