Source: curl Version: 7.21.6-2 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Ramakrishnan, Please find attached a patch to curl 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 oneiric, and should be safe to apply in Debian now that multiarch has been bootstrapped there. Would be great if you could apply this patch to the Debian package, so we can whittle away ia32-libs for wheezy. :) 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
diff -ur debian/debian/control multiarch/debian/control --- debian/debian/control 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/control 2011-05-06 06:20:55.000000000 +0100 @@ -2,7 +2,7 @@ Section: web Priority: optional Maintainer: Ramakrishnan Muthukrishnan <rkrish...@debian.org> -Build-Depends: debhelper (>> 5), autoconf, libtool, automake1.9, binutils (>= 2.14.90.0.7), libssl-dev, libgnutls-dev, libnss3-dev, zlib1g-dev, stunnel, libkrb5-dev, libidn11-dev, groff-base, libdb-dev (>= 4.6), libldap2-dev, quilt, libssh2-1-dev (>= 1.2), libgcrypt11-dev, librtmp-dev +Build-Depends: debhelper (>> 8.1.3), autoconf, libtool, automake1.9, binutils (>= 2.14.90.0.7), libssl-dev, libgnutls-dev, libnss3-dev, zlib1g-dev, stunnel, libkrb5-dev, libidn11-dev, groff-base, libdb-dev (>= 4.6), libldap2-dev, quilt, libssh2-1-dev (>= 1.2), libgcrypt11-dev, librtmp-dev Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.9.2.0 Vcs-Browser: http://git.debian.org/?p=collab-maint/curl.git @@ -29,6 +29,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates Replaces: libcurl2 (<< 1:7.11.2-2), libcurl4 Conflicts: libcurl4 +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: Multi-protocol file transfer library (OpenSSL) libcurl is designed to be a solid, usable, reliable and portable multi-protocol file transfer library. @@ -43,6 +45,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates Replaces: libcurl4-gnutls Conflicts: libcurl4-gnutls +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: Multi-protocol file transfer library (GnuTLS) libcurl is designed to be a solid, usable, reliable and portable multi-protocol file transfer library. @@ -57,6 +61,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates Replaces: libcurl4-nss Conflicts: libcurl4-nss +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: Multi-protocol file transfer library (NSS) libcurl is designed to be a solid, usable, reliable and portable multi-protocol file transfer library. @@ -122,6 +128,7 @@ Replaces: libcurl4-dbg Conflicts: libcurl4-dbg Depends: libcurl3 (= ${binary:Version}) | libcurl3-gnutls (= ${binary:Version}) | libcurl3-nss (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: libcurl compiled with debug symbols This contains the debug symbols of both the OpenSSL, GnuTLS and NSS versions of libcurl3. It might be useful in debug sessions of software which uses diff -ur debian/debian/libcurl3-gnutls.install multiarch/debian/libcurl3-gnutls.install --- debian/debian/libcurl3-gnutls.install 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl3-gnutls.install 2011-05-06 06:20:06.000000000 +0100 @@ -1 +1 @@ -usr/lib/libcurl-gnutls.so.4* +usr/lib/*/libcurl-gnutls.so.4* diff -ur debian/debian/libcurl3.install multiarch/debian/libcurl3.install --- debian/debian/libcurl3.install 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl3.install 2011-05-06 06:20:06.000000000 +0100 @@ -1 +1 @@ -usr/lib/libcurl.so.4* +usr/lib/*/libcurl.so.4* diff -ur debian/debian/libcurl3-nss.install multiarch/debian/libcurl3-nss.install --- debian/debian/libcurl3-nss.install 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl3-nss.install 2011-05-06 06:20:06.000000000 +0100 @@ -1 +1 @@ -usr/lib/libcurl-nss.so.4* +usr/lib/*/libcurl-nss.so.4* diff -ur debian/debian/libcurl4-gnutls-dev.install multiarch/debian/libcurl4-gnutls-dev.install --- debian/debian/libcurl4-gnutls-dev.install 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl4-gnutls-dev.install 2011-05-06 06:20:06.000000000 +0100 @@ -1,6 +1,6 @@ usr/bin/curl-config -usr/lib/libcurl-gnutls.a -usr/lib/libcurl-gnutls.la -usr/lib/libcurl-gnutls.so -usr/lib/pkgconfig/libcurl.pc +usr/lib/*/libcurl-gnutls.a +usr/lib/*/libcurl-gnutls.la +usr/lib/*/libcurl-gnutls.so +usr/lib/*/pkgconfig/libcurl.pc usr/include diff -ur debian/debian/libcurl4-nss-dev.install multiarch/debian/libcurl4-nss-dev.install --- debian/debian/libcurl4-nss-dev.install 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl4-nss-dev.install 2011-05-06 06:20:06.000000000 +0100 @@ -1,6 +1,6 @@ usr/bin/curl-config -usr/lib/libcurl-nss.a -usr/lib/libcurl-nss.la -usr/lib/libcurl-nss.so -usr/lib/pkgconfig/libcurl.pc +usr/lib/*/libcurl-nss.a +usr/lib/*/libcurl-nss.la +usr/lib/*/libcurl-nss.so +usr/lib/*/pkgconfig/libcurl.pc usr/include diff -ur debian/debian/libcurl4-openssl-dev.install multiarch/debian/libcurl4-openssl-dev.install --- debian/debian/libcurl4-openssl-dev.install 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl4-openssl-dev.install 2011-05-06 06:20:06.000000000 +0100 @@ -1,6 +1,6 @@ usr/bin/curl-config -usr/lib/libcurl.a -usr/lib/libcurl.la -usr/lib/libcurl.so -usr/lib/pkgconfig/libcurl.pc +usr/lib/*/libcurl.a +usr/lib/*/libcurl.la +usr/lib/*/libcurl.so +usr/lib/*/pkgconfig/libcurl.pc usr/include diff -ur debian/debian/rules multiarch/debian/rules --- debian/debian/rules 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/rules 2011-05-06 06:20:25.000000000 +0100 @@ -15,6 +15,7 @@ DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # set the number of build jobs ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -49,7 +50,7 @@ # this will catch miss-linking. (e.g. undefined symbols) # LDFLAGS = -Wl,-z,defs -CONFIGURE_ARGS = $(CROSS) --prefix=/usr --mandir=/usr/share/man --disable-dependency-tracking --enable-ipv6 --with-lber-lib=lber --enable-manual --enable-versioned-symbols --with-librtmp +CONFIGURE_ARGS = $(CROSS) --prefix=/usr --mandir=/usr/share/man --disable-dependency-tracking --enable-ipv6 --with-lber-lib=lber --enable-manual --enable-versioned-symbols --with-librtmp --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) # this is still not ready # --enable-ares # this fixes the ldap warning of dpkg-shlibdebs, but we dont want that. @@ -115,13 +116,21 @@ dh_testroot -quilt pop -a rm -rf build-stamp configure-stamp debian/build debian/build-gnutls debian/build-nss debian/tmp-gnutls debian/tmp-nss - dh_clean debian/shlibs.local + dh_clean debian/shlibs.local debian/libcurl3.links \ + debian/libcurl3-gnutls.links debian/libcurl3-nss.links \ + debian/libcurl4-gnutls-dev.links debian/libcurl4-nss-dev.links #install: DH_OPTIONS= install: build-stamp dh_testdir dh_testroot dh_clean -k + for file in libcurl3.links libcurl3-gnutls.links libcurl3-nss.links \ + libcurl4-gnutls-dev.links libcurl4-nss-dev.links; \ + do \ + sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \ + debian/$${file}.in > debian/$$file; \ + done dh_installdirs ${MAKE} -C debian/build DESTDIR=$(shell pwd)/debian/tmp install ${MAKE} -C debian/build-gnutls DESTDIR=$(shell pwd)/debian/tmp-gnutls install diff -uNr debian/debian/libcurl3-gnutls.links multiarch/debian/libcurl3-gnutls.links --- debian/debian/libcurl3-gnutls.links 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl3-gnutls.links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libcurl-gnutls.so.4 usr/lib/libcurl-gnutls.so.3 diff -uNr debian/debian/libcurl3-gnutls.links.in multiarch/debian/libcurl3-gnutls.links.in --- debian/debian/libcurl3-gnutls.links.in 1970-01-01 01:00:00.000000000 +0100 +++ multiarch/debian/libcurl3-gnutls.links.in 2011-05-06 06:20:06.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.so.4 usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.so.3 diff -uNr debian/debian/libcurl3.links multiarch/debian/libcurl3.links --- debian/debian/libcurl3.links 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl3.links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libcurl.so.4 usr/lib/libcurl.so.3 diff -uNr debian/debian/libcurl3.links.in multiarch/debian/libcurl3.links.in --- debian/debian/libcurl3.links.in 1970-01-01 01:00:00.000000000 +0100 +++ multiarch/debian/libcurl3.links.in 2011-05-06 06:20:06.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libcurl.so.4 usr/lib/${DEB_HOST_MULTIARCH}/libcurl.so.3 diff -uNr debian/debian/libcurl3-nss.links multiarch/debian/libcurl3-nss.links --- debian/debian/libcurl3-nss.links 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl3-nss.links 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libcurl-nss.so.4 usr/lib/libcurl-nss.so.3 diff -uNr debian/debian/libcurl3-nss.links.in multiarch/debian/libcurl3-nss.links.in --- debian/debian/libcurl3-nss.links.in 1970-01-01 01:00:00.000000000 +0100 +++ multiarch/debian/libcurl3-nss.links.in 2011-05-06 06:20:06.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libcurl-nss.so.4 usr/lib/${DEB_HOST_MULTIARCH}/libcurl-nss.so.3 diff -uNr debian/debian/libcurl4-gnutls-dev.links multiarch/debian/libcurl4-gnutls-dev.links --- debian/debian/libcurl4-gnutls-dev.links 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl4-gnutls-dev.links 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -/usr/share/man/man3/curl_strequal.3 /usr/share/man/man3/curl_strnequal.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_maprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mfprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msnprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvaprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvfprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsnprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsprintf.3 -/usr/lib/libcurl-gnutls.a /usr/lib/libcurl.a -/usr/lib/libcurl-gnutls.la /usr/lib/libcurl.la -/usr/lib/libcurl-gnutls.so /usr/lib/libcurl.so diff -uNr debian/debian/libcurl4-gnutls-dev.links.in multiarch/debian/libcurl4-gnutls-dev.links.in --- debian/debian/libcurl4-gnutls-dev.links.in 1970-01-01 01:00:00.000000000 +0100 +++ multiarch/debian/libcurl4-gnutls-dev.links.in 2011-05-06 06:20:06.000000000 +0100 @@ -0,0 +1,13 @@ +/usr/share/man/man3/curl_strequal.3 /usr/share/man/man3/curl_strnequal.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_maprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mfprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msnprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvaprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvfprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsnprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsprintf.3 +/usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.a /usr/lib/${DEB_HOST_MULTIARCH}/libcurl.a +/usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.la /usr/lib/${DEB_HOST_MULTIARCH}/libcurl.la +/usr/lib/${DEB_HOST_MULTIARCH}/libcurl-gnutls.so /usr/lib/${DEB_HOST_MULTIARCH}/libcurl.so diff -uNr debian/debian/libcurl4-nss-dev.links multiarch/debian/libcurl4-nss-dev.links --- debian/debian/libcurl4-nss-dev.links 2011-06-28 11:40:32.000000000 +0100 +++ multiarch/debian/libcurl4-nss-dev.links 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -/usr/share/man/man3/curl_strequal.3 /usr/share/man/man3/curl_strnequal.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_maprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mfprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msnprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvaprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvfprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsnprintf.3 -/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsprintf.3 -/usr/lib/libcurl-nss.a /usr/lib/libcurl.a -/usr/lib/libcurl-nss.la /usr/lib/libcurl.la -/usr/lib/libcurl-nss.so /usr/lib/libcurl.so diff -uNr debian/debian/libcurl4-nss-dev.links.in multiarch/debian/libcurl4-nss-dev.links.in --- debian/debian/libcurl4-nss-dev.links.in 1970-01-01 01:00:00.000000000 +0100 +++ multiarch/debian/libcurl4-nss-dev.links.in 2011-05-06 06:20:06.000000000 +0100 @@ -0,0 +1,13 @@ +/usr/share/man/man3/curl_strequal.3 /usr/share/man/man3/curl_strnequal.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_maprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mfprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msnprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_msprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvaprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvfprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsnprintf.3 +/usr/share/man/man3/curl_mprintf.3 /usr/share/man/man3/curl_mvsprintf.3 +/usr/lib/${DEB_HOST_MULTIARCH}/libcurl-nss.a /usr/lib/${DEB_HOST_MULTIARCH}/libcurl.a +/usr/lib/${DEB_HOST_MULTIARCH}/libcurl-nss.la /usr/lib/${DEB_HOST_MULTIARCH}/libcurl.la +/usr/lib/${DEB_HOST_MULTIARCH}/libcurl-nss.so /usr/lib/${DEB_HOST_MULTIARCH}/libcurl.so
signature.asc
Description: Digital signature
