[Pkg-gnutls-commits] r1231 - in /packages/gnutls26/trunk/debian: changelog control copyright

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Aug 28 16:09:55 2011
New Revision: 1231

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1231
Log:
Start preparing 2.12.9. Uses p11-kit instead of forked pakchois
for PKCS#11. Update build-depends (libp11-kit-dev and pkg-config) and
debian/copyright.

Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/control
    packages/gnutls26/trunk/debian/copyright

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1231&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Aug 28 16:09:55 2011
@@ -1,6 +1,9 @@
-gnutls26 (2.12.7-9) UNRELEASED; urgency=low
+gnutls26 (2.12.9-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream version.
+    + Uses p11-kit instead of forked pakchois for PKCS#11. Update
+      build-depends (libp11-kit-dev and pkg-config) and debian/copyright.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 28 Aug 2011 09:08:07 +0200
 

Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=1231&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sun Aug 28 16:09:55 2011
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 8.1.3), libgcrypt11-dev (>= 1.4.0), zlib1g-dev,
  cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
  libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev, datefudge,
- chrpath
+ libp11-kit-dev (>= 0.4), pkg-config, chrpath
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/gnutls26/trunk

Modified: packages/gnutls26/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/copyright?rev=1231&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/copyright (original)
+++ packages/gnutls26/trunk/debian/copyright Sun Aug 28 16:09:55 2011
@@ -132,48 +132,3 @@
 OpenSSL compatibility layer.  The gnutls library is located in the
 lib/ directory, while the gnutls-extra library is at libextra/.
 
-=========== Foreign code included in tarball ==================
-
-/lib/pakchois/ includes a modified copy of the PaKChoiS library.
-The original library was downloaded from
-http://www.manyfish.co.uk/pakchois/ and is also licensed under 
-LGPLv2.1+.
-
-Copyright:
-/*
-   pakchois PKCS#11 interface -- error mapping
-   Copyright (C) 2008, Joe Orton <joe at manyfish.co.uk>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA
-*/
-
-/*
-  This code is directly derived from the scute.org PKCS#11 cryptoki
-  interface, which is:
-
-   Copyright 2006, 2007 g10 Code GmbH
-   Copyright 2006 Andreas Jellinghaus
-
-   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.
-*/
-