[Pkg-gnutls-commits] r1707 - /packages/p11-kit/branches/experimental/debian/copyright

Sat Mar 9 11:02:45 UTC 2013

Author: ametzler
Date: Sat Mar  9 11:02:45 2013
New Revision: 1707

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1707
Log:
Update debian/copyright for 0.16.3

Modified:
    packages/p11-kit/branches/experimental/debian/copyright

Modified: packages/p11-kit/branches/experimental/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/branches/experimental/debian/copyright?rev=1707&op=diff
==============================================================================

--- packages/p11-kit/branches/experimental/debian/copyright (original)
+++ packages/p11-kit/branches/experimental/debian/copyright Sat Mar  9 11:02:45 2013
@@ -155,13 +155,43 @@
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
 
-Files: common/mock.h
-Copyright: 2011 Collabora Ltd.
-License: GPL-2.0+
-Comment: only used in testsuite, the actual library is under a combination
- of non-copyleft (mainly BSD) licenses.
+Files: common/compat.c
+Copyright: Copyright (c) 2011 Collabora Ltd.
+ Portions of this file are covered by the following copyright:
+ Copyright (c) 2001 Mike Barcroft <mike at FreeBSD.org>
+ Copyright (c) 1990, 1993
+ Copyright (c) 1987, 1993
+      The Regents of the University of California. 
+License: BSD-3-Clause
+ This code is derived from software contributed to Berkeley by
+ Chris Torek.
+ 
+ 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.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
 
 Files: p11-kit/iter.c p11-kit/iter.h p11-kit/tests/test-iter.c
+ common/mock.h trust/tests/frob-nss-trust.c
 Copyright: 2013 Red Hat Inc.
 License: BSD-3-Clause
 


