[Pkg-silc-commits] r177 - in /silc-toolkit/trunk/debian: changelog copyright

[lunar at users.alioth.debian.org]

Author: lunar
Date: Tue Sep 25 20:16:25 2007
New Revision: 177

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

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

Modified: silc-toolkit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/changelog?rev=177&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/changelog (original)
+++ silc-toolkit/trunk/debian/changelog Tue Sep 25 20:16:25 2007
@@ -1,8 +1,9 @@
 silc-toolkit (1.1.3-2) UNRELEASED; urgency=low
 
   * Make the clean rule policy compliant. (Closes: #442731)
+  * Fix debian/copyright issues mentioned by ftpmaster. 
 
- -- Jérémy Bobbio <lunar at debian.org>  Mon, 17 Sep 2007 21:40:59 +0200
+ -- Jérémy Bobbio <lunar at debian.org>  Tue, 25 Sep 2007 22:16:07 +0200
 
 silc-toolkit (1.1.3-1) unstable; urgency=low
 

Modified: silc-toolkit/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/copyright?rev=177&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/copyright (original)
+++ silc-toolkit/trunk/debian/copyright Tue Sep 25 20:16:25 2007
@@ -141,42 +141,44 @@
 
     Copyright (C) 1998-2006 Brian Gladman
 
-    Licensed under the GNU General Public License
-    OR under the following terms:
-
-      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
-           iin 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.
+    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
-    OR under the following terms:
-
-      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
-           iin 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.
+    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: