Source: gnutls26 Version: 2.10.5-2 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: ubuntu-patch oneiric origin-ubuntu
Hi folks, Please find attached a patch to gnutls26 to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been applied and is being used successfully in Ubuntu 11.04, and should be safe to apply in Debian now that multiarch has been bootstrapped there. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-25 18:13:38 +0000
+++ debian/changelog 2011-07-17 01:59:19 +0000
@@ -1,3 +1,10 @@
+gnutls26 (2.10.5-2.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Build for multiarch.
+
+ -- Steve Langasek <steve.langa...@ubuntu.com> Sat, 16 Jul 2011 18:57:27 -0700
+
gnutls26 (2.10.5-2) unstable; urgency=low
* Stop shipping libtool la files.
=== modified file 'debian/control'
--- debian/control 2011-02-06 16:44:09 +0000
+++ debian/control 2011-07-17 02:08:41 +0000
@@ -6,8 +6,8 @@
Eric Dorland <e...@debian.org>,
James Westby <jw+deb...@jameswestby.net>,
Simon Josefsson <si...@josefsson.org>
-Build-Depends: debhelper (>= 7.0.14), libgcrypt11-dev (>= 1.3.2), zlib1g-dev,
- cdbs (>= 0.4.53), gtk-doc-tools, texinfo (>= 4.8),
+Build-Depends: debhelper (>= 8.1.3), libgcrypt11-dev (>= 1.3.2), 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
Build-Conflicts: libgnutls-dev
Standards-Version: 3.9.1
@@ -52,6 +52,8 @@
# Bug 587755. - This could be removed after a libgnutls soname bump.
Breaks: libsoup2.4-1 (<= 2.30.1-1), libsoup2.4-1 (= 2.31.2-1)
Suggests: gnutls-bin
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: the GNU TLS library - 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.
@@ -76,6 +78,7 @@
Section: debug
Depends: libgnutls26 (= ${binary:Version}), ${misc:Depends}
Conflicts: libgnutls13-dbg
+Multi-Arch: same
Description: GNU TLS library - debugger symbols
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.
@@ -89,6 +92,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgnutls5-dev, gnutls0.4-dev, gnutls-dev (<< 0.4.0-0)
Replaces: libgnutls5-dev, gnutls0.4-dev, gnutls-dev (<< 0.4.0-0)
+Multi-Arch: foreign
Description: the GNU TLS library - commandline utilities
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.
@@ -114,6 +118,7 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: the GNU TLS library - documentation and examples
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.
@@ -137,6 +142,8 @@
Architecture: any
Section: lisp
Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: the 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.
@@ -160,6 +167,8 @@
Architecture: any
Section: libs
Depends: libgnutls26 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: the GNU TLS library - C++ 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.
=== modified file 'debian/guile-gnutls.install'
--- debian/guile-gnutls.install 2010-03-20 15:53:35 +0000
+++ debian/guile-gnutls.install 2011-07-17 01:56:47 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libguile-gnutls*.so* usr/lib
-debian/tmp/usr/share/guile/site usr/share/guile
+debian/tmp/usr/lib/*/libguile-gnutls*.so*
+debian/tmp/usr/share/guile/site
=== modified file 'debian/libgnutls-dev.install'
--- debian/libgnutls-dev.install 2011-06-25 18:13:38 +0000
+++ debian/libgnutls-dev.install 2011-07-17 01:57:07 +0000
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/libgnutls*.so usr/lib
-debian/tmp/usr/lib/libgnutls*.a usr/lib
-debian/tmp/usr/lib/pkgconfig/gnutls.pc usr/lib/pkgconfig
-debian/tmp/usr/lib/pkgconfig/gnutls-extra.pc usr/lib/pkgconfig
+debian/tmp/usr/include/*
+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 file 'debian/libgnutls26.install'
--- debian/libgnutls26.install 2008-05-01 13:09:49 +0000
+++ debian/libgnutls26.install 2011-07-17 01:56:47 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libgnutls.so.* usr/lib
-debian/tmp/usr/lib/libgnutls-*.so.* usr/lib
-debian/tmp/usr/share/locale/* /usr/share/locale
+debian/tmp/usr/lib/*/libgnutls.so.*
+debian/tmp/usr/lib/*/libgnutls-*.so.*
+debian/tmp/usr/share/locale/*
=== modified file 'debian/libgnutlsxx26.install'
--- debian/libgnutlsxx26.install 2009-12-20 11:31:33 +0000
+++ debian/libgnutlsxx26.install 2011-07-17 01:56:47 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libgnutlsxx.so.* usr/lib
+debian/tmp/usr/lib/*/libgnutlsxx.so.*
=== modified file 'debian/rules'
--- debian/rules 2011-06-25 18:13:38 +0000
+++ debian/rules 2011-07-17 01:56:47 +0000
@@ -4,7 +4,11 @@
include /usr/share/cdbs/1/rules/debhelper.mk
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 --cache-file=$(CURDIR)/config.cache
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
+ --without-lzo --enable-guile \
+ --with-guile-site-dir=/usr/share/guile/site \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --cache-file=$(CURDIR)/config.cache
DEB_MAKE_CHECK_TARGET = check
DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>=2.9.11-0)'
DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>=2.9.11-0)'
signature.asc
Description: Digital signature
