[Pkg-gnutls-commits] r1147 - in /packages/p11-kit/trunk/debian: changelog copyright

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Aug  7 09:36:01 2011
New Revision: 1147

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1147
Log:
Add info for p11-kit/pkcs11.h to debian/copyright.

Modified:
    packages/p11-kit/trunk/debian/changelog
    packages/p11-kit/trunk/debian/copyright

Modified: packages/p11-kit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/changelog?rev=1147&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/changelog (original)
+++ packages/p11-kit/trunk/debian/changelog Sun Aug  7 09:36:01 2011
@@ -2,6 +2,7 @@
 
   * Upload to Debian.
   * Add watch file.
+  * Add info for p11-kit/pkcs11.h to debian/copyright.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 07 Aug 2011 10:50:03 +0200
 

Modified: packages/p11-kit/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/p11-kit/trunk/debian/copyright?rev=1147&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/copyright (original)
+++ packages/p11-kit/trunk/debian/copyright Sun Aug  7 09:36:01 2011
@@ -9,10 +9,32 @@
 Files: p11-kit/hash.*
 Copyright: 2011 Collabora Ltd.
            2004 Stefan Walter
+           2000-2004 The Apache Software Foundation
 License: BSD-3-Clause and Apache
+
+Files: p11-kit/conf.* p11-kit/modules.c p11-kit/proxy.c
+Copyright: 2011 Collabora Ltd.
+           2004 Stefan Walter
+License: BSD-3-Clause
+
+Files: p11-kit/pkcs11.h
+Copyright: 2006, 2007 g10 Code GmbH
+           2006 Andreas Jellinghaus
+License: 
+   This file is free software; as a special exception the author gives
+   unlimited permission to copy and/or distribute it, with or without
+   modifications, as long as this notice is preserved.
+
+   This file is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+   PURPOSE.  */
+
+
 
 Files: debian/*
 Copyright: 2011 Chris Coulson <chris.coulson at canonical.com>
+           2011 Andreas Metzler <ametzler at debian.org>
 License: GPL-2.0+
 
 License: BSD-3-Clause