[Pkg-silc-commits] r176 - in /silc-client/trunk/debian: changelog copyright

[lunar at users.alioth.debian.org]

Author: lunar
Date: Tue Sep 25 20:13:52 2007
New Revision: 176

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

Modified:
    silc-client/trunk/debian/changelog
    silc-client/trunk/debian/copyright

Modified: silc-client/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/trunk/debian/changelog?rev=176&op=diff
==============================================================================
--- silc-client/trunk/debian/changelog (original)
+++ silc-client/trunk/debian/changelog Tue Sep 25 20:13:52 2007
@@ -2,8 +2,9 @@
 
   * Fix typo in README.Debian for irssi-plugin-silc.
   * Improve the package description, thanks to Anarcat.
-
- -- Jérémy Bobbio <lunar at debian.org>  Wed, 05 Sep 2007 07:51:00 +0200
+  * Fix issues in debian/copyright mentioned by ftpmaster. 
+
+ -- Jérémy Bobbio <lunar at debian.org>  Tue, 25 Sep 2007 22:13:24 +0200
 
 silc-client (1.1.2-2) unstable; urgency=low
 

Modified: silc-client/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-silc/silc-client/trunk/debian/copyright?rev=176&op=diff
==============================================================================
--- silc-client/trunk/debian/copyright (original)
+++ silc-client/trunk/debian/copyright Tue Sep 25 20:13:52 2007
@@ -344,8 +344,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:
@@ -362,14 +362,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: