[Pkg-gnutls-commits] r1275 - in /packages/gnutls28/trunk/debian: changelog control copyright libgnutls-dev.install libgnutls-extra28.install rules

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sat Oct 15 09:43:54 UTC 2011 

Author: ametzler
Date: Sat Oct 15 09:43:53 2011
New Revision: 1275

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1275
Log:
Stop shipping libgnutls-extra.so. It is an empty shell currently and will be packaged for Debian again when it provides functionality.

Removed:
    packages/gnutls28/trunk/debian/libgnutls-extra28.install
Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/control
    packages/gnutls28/trunk/debian/copyright
    packages/gnutls28/trunk/debian/libgnutls-dev.install
    packages/gnutls28/trunk/debian/rules

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1275&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Oct 15 09:43:53 2011
@@ -7,6 +7,8 @@
   * Add libp11-kit-dev to libgnutls-dev dependencies. Closes: #643811
   * [20_addGNU-stack.diff] Add GNU-stack note to newly added
     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.
 
  -- Andreas Metzler <ametzler at debian.org>  Tue, 20 Sep 2011 19:44:22 +0200
 

Modified: packages/gnutls28/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/control?rev=1275&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/control (original)
+++ packages/gnutls28/trunk/debian/control Sat Oct 15 09:43:53 2011
@@ -22,7 +22,6 @@
 Provides: gnutls-dev
 Depends: libgnutls28 (= ${binary:Version}), 
  libgnutlsxx28 (= ${binary:Version}),libgnutls-openssl27 (= ${binary:Version}),
- libgnutls-extra28 (= ${binary:Version}), 
  nettle-dev (>= 2.2), libc6-dev | libc-dev, zlib1g-dev,
  libtasn1-3-dev (>= 0.3.4), libp11-kit-dev (>= 0.4), ${misc:Depends}
 Suggests: gnutls-doc, gnutls-bin, guile-gnutls
@@ -207,28 +206,3 @@
  .
  This package contains the runtime library of the GnuTLS OpenSSL wrapper.
 
-Package: libgnutls-extra28
-Priority: standard
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: GNU TLS library - GnuTLS extra (GPL) runtime library
- GnuTLS is a portable library which implements the Transport Layer
- Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
- .
- GnuTLS features support for:
-  - TLS extensions: server name indication, max record size, opaque PRF
-    input, etc.
-  - authentication using the SRP protocol.
-  - authentication using both X.509 certificates and OpenPGP keys.
-  - TLS Pre-Shared-Keys (PSK) extension.
-  - Inner Application (TLS/IA) extension.
-  - X.509 and OpenPGP certificate handling.
-  - X.509 Proxy Certificates (RFC 3820).
-  - all the strong encryption algorithms (including SHA-256/384/512 and
-    Camellia (RFC 4132)).
- .
- This package contains the GPL (instead of LGPL) licensed parts of the GnuTLS
- runtime library.
-

Modified: packages/gnutls28/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/copyright?rev=1275&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/copyright (original)
+++ packages/gnutls28/trunk/debian/copyright Sat Oct 15 09:43:53 2011
@@ -76,12 +76,12 @@
 
 
 License: The main library is licensed under GNU Lesser General Public
-License (LGPL) version 3+, Gnutls Extra (i.e. openssl wrapper library,
-and library for code for "GnuTLS Inner Application" support) build system,
-testsuite and commandline utilities are licenced under the GNU General
-Public License version 3+. The Guile bindings use the same license as the
-respective underlying library, i.e. LGPLv3+ for the main library and
-GPLv3+ for Gnutls extra.
+License (LGPL) version 3+, Gnutls Extra (which is currently just the
+openssl wrapper library, the gnutls-extra library is just an empty
+shell), build system, testsuite and commandline utilities are licenced
+under the GNU General Public License version 3+. The Guile bindings use
+the same license as the respective underlying library, i.e.  LGPLv3+ for
+the main library and GPLv3+ for Gnutls extra.
 
 Copyright:
 --------------------
@@ -151,30 +151,24 @@
 License is available under /usr/share/common-licenses/GFDL-1.3.
 
 
+============================================
 Excerpt from upstream's README:
-LICENSE ISSUES
---------------
-
-Since the 0.4.2 version the gnutls library is covered under the GNU
-Lesser GPL. Previously released versions were licensed under the GNU
-GPL.
-
-We changed the license for most of GNUTLS because other free libraries
-already exist that do the same jobs and have lax licenses.  We want
-GNUTLS to be usable in all the same places as those other libraries.
-We kept some parts of GNUTLS under the GPL because they are unique,
-and with the GPL they provide free software projects (which deserve
-our help) an advantage over non-free projects (which do not deserve
-our help, since they refuse to share with us).  For more explanation,
-see http://www.gnu.org/philosophy/why-not-lgpl.html.
-
-The GNU Lesser GPL license applies to the main gnutls library, while
-the gnutls-extra library is under the GPL. The gnutls-extra library
-contains the code for "GnuTLS Inner Application" support and the
-OpenSSL compatibility layer.  The gnutls library is located in the
-lib/ directory, while the gnutls-extra library is at libextra/.
+LICENSING
+---------
+Since GnuTLS version 3.0.0, the core library has been released under
+the GNU Lesser General Public License (LGPL) version 3 or later.
+
+The GNU LGPL applies to the main GnuTLS library, while the
+included applications as well as gnutls-extra and gnutls-openssl
+libraries are under the GNU GPL version 3.  The gnutls library is
+located in the lib/ directory, while the applications in src/ and
+gnutls-extra and gnutls-openssl library are at libextra/.
+
+For any copyright year range specified as YYYY-ZZZZ in this package
+note that the range specifies every single year in that closed interval.
 
 ============================================
+
 Non FSF code
 
 crywrap is shipped with GnuTLS.

Modified: packages/gnutls28/trunk/debian/libgnutls-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/libgnutls-dev.install?rev=1275&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/libgnutls-dev.install (original)
+++ packages/gnutls28/trunk/debian/libgnutls-dev.install Sat Oct 15 09:43:53 2011
@@ -2,5 +2,3 @@
 debian/tmp/usr/lib/*/libgnutls*.so
 debian/tmp/usr/lib/*/libgnutls*.a
 debian/tmp/usr/lib/*/pkgconfig/gnutls.pc
-debian/tmp/usr/lib/*/pkgconfig/gnutls-extra.pc
-

Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1275&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules (original)
+++ packages/gnutls28/trunk/debian/rules Sat Oct 15 09:43:53 2011
@@ -14,7 +14,6 @@
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_MAKESHLIBS_ARGS_libgnutls28 := -V 'libgnutls28 (>= 3.0.4-0)'
 DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx28 := -V 'libgnutlsxx28 (>= 3.0.4-0)'
-DEB_DH_MAKESHLIBS_ARGS_libgnutls-extra28 := -V 'libgnutls-extra28 (>= 3.0.4-0)'
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>= 3.0.4-0)'
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 
@@ -52,11 +51,6 @@
 	cd ../.. && \
 	dh_link -pgnutls-doc
 
-binary-install/libgnutls-extra28::
-	rm -vrf debian/libgnutls-extra28/usr/share/doc/libgnutls-extra28
-	dh_link -plibgnutls-extra28 usr/share/doc/libgnutls28 \
-		usr/share/doc/libgnutls-extra28
-
 binary-install/libgnutlsxx28::
 	rm -vrf debian/libgnutlsxx28/usr/share/doc/libgnutlsxx28
 	dh_link -plibgnutlsxx28 usr/share/doc/libgnutls28 \
@@ -65,3 +59,14 @@
 common-install-arch::
 	find debian/*/usr/lib/* -name '*.so.*.*' -type f -exec \
 		chrpath -d {} +
+	cd debian/tmp && rm -vf usr/include/gnutls/extra.h \
+		usr/lib/*/libgnutls-extra.* \
+		usr/lib/*/pkgconfig/gnutls-extra.pc \
+		usr/lib/*/libguile-gnutls-extra* \
+		usr/share/guile/site/gnutls/extra.scm
+
+common-install-indep::
+	cd debian/tmp && rm -fv \
+		usr/share/gtk-doc/html/gnutls/gnutls-extra.html \
+		usr/share/man/man3/gnutls_global_init_extra.3 \
+		usr/share/man/man3/gnutls_extra_check_version.3

More information about the Pkg-gnutls-commits mailing list