[Pkg-gnutls-commits] r1353 - in /packages/gnutls26/trunk/debian: changelog control guile-gnutls.README.Debian guile-gnutls.install guile-gnutls.lintian-overrides rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Dec 17 11:05:34 2011
New Revision: 1353

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1353
Log:
Disable gnutls-guile package, let it be provided by gnutls28.

Removed:
    packages/gnutls26/trunk/debian/guile-gnutls.README.Debian
    packages/gnutls26/trunk/debian/guile-gnutls.install
    packages/gnutls26/trunk/debian/guile-gnutls.lintian-overrides
Modified:
    packages/gnutls26/trunk/debian/changelog
    packages/gnutls26/trunk/debian/control
    packages/gnutls26/trunk/debian/rules

Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1353&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sat Dec 17 11:05:34 2011
@@ -1,6 +1,7 @@
 gnutls26 (2.12.14-5) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Disable gnutls-guile package, let it be provided by gnutls28.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 03 Dec 2011 09:58:14 +0100
 

Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=1353&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sat Dec 17 11:05:34 2011
@@ -8,7 +8,7 @@
  Simon Josefsson <simon at josefsson.org>
 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,
+ libtasn1-3-dev (>= 0.3.4-0), autotools-dev, datefudge,
  libp11-kit-dev (>= 0.4), pkg-config, chrpath
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.9.2
@@ -24,7 +24,7 @@
  libgnutlsxx27 (= ${binary:Version}),libgnutls-openssl27 (= ${binary:Version}),
  libgcrypt11-dev (>= 1.4.0), libc6-dev | libc-dev, zlib1g-dev,
  libtasn1-3-dev (>= 0.3.4), libp11-kit-dev (>= 0.4), ${misc:Depends}
-Suggests: gnutls-doc, guile-gnutls
+Suggests: gnutls-doc
 Conflicts: gnutls-dev
 Replaces: gnutls-dev
 Description: GNU TLS library - development files
@@ -116,30 +116,6 @@
  .
  This package contains all the GnuTLS documentation.
 
-Package: guile-gnutls
-Architecture: any
-Section: lisp
-Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: GNU TLS library - GNU Guile bindings
- 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 GNU Guile 1.8 modules.
-
 Package: libgnutlsxx27
 Priority: extra
 Architecture: any

Modified: packages/gnutls26/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/rules?rev=1353&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/rules (original)
+++ packages/gnutls26/trunk/debian/rules Sat Dec 17 11:05:34 2011
@@ -5,8 +5,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
-	--without-lzo --enable-guile \
-	--with-guile-site-dir=/usr/share/guile/site \
+	--without-lzo --disable-guile \
 	--cache-file=$(CURDIR)/config.cache --with-libgcrypt \
 	--with-packager=Debian \
 	--with-packager-bug-reports=http://bugs.debian.org/ \
@@ -14,13 +13,7 @@
 	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>= 2.12.6.1-0)'
-DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>= 2.12.6.1-0)'
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
-
-# workaround for guile testsuite failure.
-ifneq (,$(filter $(DEB_BUILD_ARCH),armel armhf mipsel))
-	DEB_CONFIGURE_EXTRA_FLAGS += --disable-largefile
-endif
 
 # pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
 # See README.source