[Pkg-silc-commits] r103 - in /silc-toolkit/trunk/debian: changelog copyright
lunar at users.alioth.debian.org
lunar at users.alioth.debian.org
Wed Jun 27 13:12:17 UTC 2007
Author: lunar
Date: Wed Jun 27 13:12:17 2007
New Revision: 103
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=103
Log:
* More cleanups and fixes in debian/copyright.
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=103&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/changelog (original)
+++ silc-toolkit/trunk/debian/changelog Wed Jun 27 13:12:17 2007
@@ -5,8 +5,9 @@
* Use --docdir instead of --with-docdir for ./configure in debian/rules.
* Fix lintian warning "debian-rules-ignores-make-clean-error" in
debian/rules.
+ * More cleanups and fixes in debian/copyright.
- -- Jérémy Bobbio <lunar at debian.org> Wed, 27 Jun 2007 13:52:16 +0200
+ -- Jérémy Bobbio <lunar at debian.org> Wed, 27 Jun 2007 15:11:17 +0200
silc-toolkit (1.1-1) unstable; urgency=low
Modified: silc-toolkit/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/copyright?rev=103&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/copyright (original)
+++ silc-toolkit/trunk/debian/copyright Wed Jun 27 13:12:17 2007
@@ -14,12 +14,43 @@
License:
- silc-toolkit is distributed under the terms of the GNU General Public
- License, version 2.
-
-On Debian systems, a copy of the GNU General Public License, version 2 is
-available in /usr/share/common-licenses/GPL-2 as part of the base-files
-package.
+ The SILC Toolkit distribution is dual-licensed distribution. The following
+ licenses govern this distribution, and you are free to choose either one of
+ the licenses:
+
+ - GNU General Public License, Version 2
+
+ On Debian systems, a copy of the GNU General Public License, version 2
+ is available in /usr/share/common-licenses/GPL-2 as part of the
+ base-files package.
+
+ - Revised BSD License
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ 3. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
Exceptions to the previous statements:
@@ -92,8 +123,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:
@@ -110,14 +141,42 @@
Copyright (C) 1998-2006 Brian Gladman
- Licensed under the GNU General Public License.
+ 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.
* lib/silccrypt/aes_x86.asm,
lib/silccrypt/aes_x86_64.asm:
Copyright (C) 2002 Brian Gladman
- Licensed under the GNU General Public License.
+ 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.
* lib/silccrypt/blowfish.c:
@@ -151,7 +210,21 @@
Copyright (C) 1998-2006 Brian Gladman
- Licensed under the GNU General Public License.
+ 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.
* lib/silccrypt/sha1.c,
lib/silccrypt/sha1_internal.h:
@@ -181,7 +254,7 @@
Copyright (C) 2002-2006 Giovanni Giacobbi
- Licensed under the GNU General Public License, version 2.
+ Licensed under the same terms as SILC Toolkit.
* lib/silcutil/silcsnprintf.c:
More information about the Pkg-silc-commits
mailing list