[Pkg-gnutls-commits] r1276 - in /packages/gnutls28/trunk/debian: changelog copyright

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Oct 15 10:01:15 2011
New Revision: 1276

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1276
Log:
Update debian/copyright, accelerated assembly code is non-FSF copyright.

Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/copyright

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1276&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Oct 15 10:01:15 2011
@@ -9,6 +9,7 @@
     padlock-common.s.
   * Stop shipping libgnutls-extra.so. It is an empty shell currently and will
     be packaged for Debian again when it provides functionality.
+  * Update debian/copyright, accelerated assembly code is non-FSF copyright.
 
  -- Andreas Metzler <ametzler at debian.org>  Tue, 20 Sep 2011 19:44:22 +0200
 

Modified: packages/gnutls28/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/copyright?rev=1276&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/copyright (original)
+++ packages/gnutls28/trunk/debian/copyright Sat Oct 15 10:01:15 2011
@@ -220,3 +220,46 @@
 .\" versions, except that this permission notice may be stated in a
 .\" translation approved by the Author.
 --------------------
+
+lib/accelerated/x86 contains code by Andy Polyakov <appro at fy.chalmers.se>,
+copyright is not assigned to the FSF. The code is licensed under the
+CRYPTOGAMS license.
+
+--------------------
+# Copyright (c) 2011, Andy Polyakov by <appro at openssl.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#     * Redistributions of source code must retain copyright notices,
+#      this list of conditions and the following disclaimer.
+#
+#     * 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.
+#
+#     * Neither the name of the Andy Polyakov nor the names of its
+#      copyright holder and contributors may be used to endorse or
+#      promote products derived from this software without specific
+#      prior 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
+# "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 COPYRIGHT
+# OWNER OR CONTRIBUTORS 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.
+--------------------