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

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Aug  7 11:40:19 2011
New Revision: 1153

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1153
Log:
update debian/copyrights for 0.3

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=1153&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/changelog (original)
+++ packages/p11-kit/trunk/debian/changelog Sun Aug  7 11:40:19 2011
@@ -1,8 +1,7 @@
-p11-kit (0.2-1) unstable; urgency=low
+p11-kit (0.3-1) unstable; urgency=low
 
   * Upload to Debian.
   * Add watch file.
-  * Add info for p11-kit/pkcs11.h to debian/copyright.
   * Convert to multi-arch:
    + configure with --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH), update
      *.install accordingly.
@@ -16,6 +15,9 @@
     --pedantic happy.
   * Build with --disable-silent-rules.
   * Add Vcs-Svn and Vcs-Browser fields.
+  * New upstream version, does not contain Apache 2.0 licensed code anymore.
+  * Add info for p11-kit/pkcs11.h to debian/copyright, drop Apache 2.0 license
+    bits.
 
  -- 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=1153&op=diff
==============================================================================
--- packages/p11-kit/trunk/debian/copyright (original)
+++ packages/p11-kit/trunk/debian/copyright Sun Aug  7 11:40:19 2011
@@ -6,13 +6,7 @@
 Copyright: 2011 Collabora Ltd.
 License: BSD-3-Clause
 
-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
+Files: p11-kit/hashmap.* p11-kit/conf.* p11-kit/modules.c p11-kit/proxy.c
 Copyright: 2011 Collabora Ltd.
            2004 Stefan Walter
 License: BSD-3-Clause
@@ -79,19 +73,3 @@
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: Apache
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache version 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
-