<sigh> Patch attached.
:) -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/ On Thu, Jun 14, 2007 at 04:37:42PM -0700, Steve Langasek wrote: > Hi Domenico, > > We talked a while back about the curl transition, and about how upstream's > change from libcurl.so.3 to libcurl.so.4 is gratuitously painful for us in > light of the large number of reverse dependencies. > > The libcurl transition has at this point gotten tangled with soname > transitions in jasper, exiv2, kexiv2, and God only knows what else. So I'd > like to revisit this question, because tracking this transition is costing > the release team a lot of time that would be better spent elsewhere, and > removing the need for a libcurl transition promises to reduce the complexity > of the other components by an order of magnitude. > > On looking at the curl package, I've come to understand that the symbol > versioning in place in this library is the result of a Debian-local patch. > That's great news, because it suggests a solution to this quandary that > doesn't require an unreasonable amount of developer time. > > I am proposing the following: > > - Keep the library soname the same as it currently is upstream. Because > upstream uses unversioned symbols, our package will be binary-compatible > with applications built against the upstream libcurl regardless of what we > do with symbol versioning, so leaving the soname alone minimizes the > amount of patching to be done against upstream code here. > - *Revert* the Debian symbol versioning to the libcurl3 version, and make > libcurl.so.3 a symlink to libcurl.so.4. We have already established that > libcurl.so.4 is still API-compatible with libcurl.so.3, in spite of the > soname change upstream; reverting the symbol versioning will make it fully > ABI-compatible with libcurl.so.3, and adding the symlink lets > previously-built binaries find it. > - Revert the Debian package names to the curl 7.15.5 versions. Because > compatibility has been restored with libcurl3 and libcurl3-gnutls, > restoring the package names provides the best upgrade path from etch to > lenny; and because the symbol versions have been reverted, the libraries > are not binary-compatible with the Debian packages currently named > libcurl4/libcurl4-gnutls/libcurl4-openssl (in spite of being > binary-compatible with upstream), so it would be wrong to keep the current > names regardless. > - Drop the SSL-less variant of the library, which was not present in curl > 7.15.5; AFAICS, there is no use case where a user of curl *needs* to *not* > have SSL support, so this split seems to be unnecessary overhead. Please > correct me if I'm mistaken. > - Leave the -dev package names alone otherwise, to simplify binNMUing of the > reverse-dependencies (some packages have already added versioned > build-deps on libcurl4.*-dev -- I have no idea why -- so reverting the > names would mean more work to chase down those packages). Drop > libcurl4-dev as a binary package, though, in favor of being Provided by > libcurl4-gnutls-dev. Many of the packages currently build-depending on > libcurl4-dev -- including some that wrongly used libcurl3-dev before -- > are GPL, and these are apparently all packages where having SSL support > missing in libcurl4 wasn't hurting them, so libcurl4-gnutls-dev seems to > be the reasonable "default" here. > - Schedule binNMUs for all reverse-dependencies. > > As a result of these changes, curl 7.16 can proceed into testing as soon as > it alone is ready to go, without breaking any of the reverse-dependencies; > and each reverse-dependency can follow it as soon as it too is ready. > > Please let me know if you see any technical disadvantages to this solution. > The attached patch is a preliminary implementation of what I describe, which > I am in the process of testing. If you approve of these changes, I would > like to see this uploaded to unstable (via NEW) ASAP, either as a maintainer > upload or as an NMU, so that we can un-stick the several hundred packages > currently blocked by this together with other, uncoordinated and untimely > soname changes. > > 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. > [EMAIL PROTECTED] http://www.debian.org/
diff -u curl-7.16.2/debian/control curl-7.16.2/debian/control --- curl-7.16.2/debian/control +++ curl-7.16.2/debian/control @@ -23,28 +23,14 @@ . Homepage: http://curl.haxx.se -Package: libcurl4 +Package: libcurl3 Architecture: any Section: libs Suggests: libldap2 Depends: ${shlibs:Depends} -Description: Multi-protocol file transfer library (no SSL) - libcurl is designed to be a solid, usable, reliable and portable - multi-protocol file transfer library. - . - No SSL support is provided. - . - This is the shared version of libcurl. - . - Homepage: http://curl.haxx.se - -Package: libcurl4-openssl -Architecture: any -Section: libs -Suggests: libldap2 -Depends: ${shlibs:Depends} -Recommends: ca-certificates -Description: Multi-protocol file transfer library (SSL/OpenSSL) +Replaces: libcurl2 (<< 1:7.11.2-2), libcurl4 +Conflicts: libcurl4 +Description: Multi-protocol file transfer library (OpenSSL) libcurl is designed to be a solid, usable, reliable and portable multi-protocol file transfer library. . @@ -54,13 +40,15 @@ . Homepage: http://curl.haxx.se -Package: libcurl4-gnutls +Package: libcurl3-gnutls Architecture: any Section: libs Suggests: libldap2 Depends: ${shlibs:Depends} Recommends: ca-certificates -Description: Multi-protocol file transfer library (SSL/GnuTLS) +Replaces: libcurl4-gnutls +Conflicts: libcurl4-gnutls +Description: Multi-protocol file transfer library (GnuTLS) libcurl is designed to be a solid, usable, reliable and portable multi-protocol file transfer library. . @@ -70,33 +58,15 @@ . Homepage: http://curl.haxx.se -Package: libcurl4-dev -Architecture: any -Section: libdevel -Suggests: libcurl4-dbg -Provides: libcurl-dev -Replaces: libcurl-dev -Conflicts: libcurl-dev -Depends: libcurl4 (= ${Source-Version}), libc6-dev | libc-dev, zlib1g-dev, libidn11-dev -Description: Development files and documentation for libcurl (no SSL) - These files (ie. includes, static library, manual pages) allow to - build software which uses libcurl. - . - No SSL support is provided. - . - HTML and PDF versions of all the manual pages are also provided. - . - Homepage: http://curl.haxx.se - Package: libcurl4-openssl-dev Architecture: any Section: libdevel -Suggests: libcurl4-dbg +Suggests: libcurl3-dbg Provides: libcurl-dev, libcurl-ssl-dev, libcurl3-openssl-dev, libcurl3-dev Replaces: libcurl-dev, libcurl-ssl-dev, libcurl3-openssl-dev, libcurl3-dev (<< 7.14.1-1) Conflicts: libcurl-dev -Depends: libcurl4-openssl (= ${Source-Version}), libc6-dev | libc-dev, libssl-dev, zlib1g-dev, libidn11-dev, libkrb5-dev | hurd -Description: Development files and documentation for libcurl (SSL/OpenSSL) +Depends: libcurl3 (= ${Source-Version}), libc6-dev | libc-dev, libssl-dev, zlib1g-dev, libidn11-dev, libkrb5-dev | hurd +Description: Development files and documentation for libcurl (OpenSSL) These files (ie. includes, static library, manual pages) allow to build software which uses libcurl. . @@ -109,11 +79,11 @@ Package: libcurl4-gnutls-dev Architecture: any Section: libdevel -Provides: libcurl-dev, libcurl-ssl-dev, libcurl3-gnutls-dev -Replaces: libcurl-dev, libcurl-ssl-dev, libcurl3-gnutls-dev +Provides: libcurl-dev, libcurl-ssl-dev, libcurl3-gnutls-dev, libcurl4-dev +Replaces: libcurl-dev, libcurl-ssl-dev, libcurl3-gnutls-dev, libcurl4-dev Conflicts: libcurl-dev -Depends: libcurl4-gnutls (= ${Source-Version}), libc6-dev | libc-dev, libgnutls-dev, zlib1g-dev, libidn11-dev, libkrb5-dev | hurd -Description: Development files and documentation for libcurl (SSL/GnuTLS) +Depends: libcurl3-gnutls (= ${Source-Version}), libc6-dev | libc-dev, libgnutls-dev, zlib1g-dev, libidn11-dev, libkrb5-dev | hurd +Description: Development files and documentation for libcurl (GnuTLS) These files (ie. includes, static library, manual pages) allow to build software which uses libcurl. . @@ -124,13 +94,13 @@ Homepage: http://curl.haxx.se -Package: libcurl4-dbg +Package: libcurl3-dbg Architecture: any Section: libdevel Priority: extra Suggests: libc-dbg -Recommends: libcurl4 (= ${Source-Version}), libcurl4-openssl (= ${Source-Version}), libcurl4-gnutls (= ${Source-Version}) +Recommends: libcurl3 (= ${Source-Version}), libcurl3-gnutls (= ${Source-Version}) Description: libcurl compiled with debug symbols This contains the debug symbols of both the OpenSSL and GnuTLS versions of - libcurl4. It might be useful in debug sessions of software which uses libcurl. + libcurl3. It might be useful in debug sessions of software which uses libcurl. . Homepage: http://curl.haxx.se diff -u curl-7.16.2/debian/rules curl-7.16.2/debian/rules --- curl-7.16.2/debian/rules +++ curl-7.16.2/debian/rules @@ -41,7 +41,7 @@ #configure-stamp: DH_OPTIONS= configure-stamp: dh_testdir - mkdir -p debian/build debian/build-gnutls debian/build-openssl + mkdir -p debian/build debian/build-gnutls quilt push versioned tar -cf - --exclude=debian . | tar -xf - -C debian/build @@ -49,15 +49,11 @@ quilt push gnutls tar -cf - --exclude=debian . | tar -xf - -C debian/build-gnutls - quilt push openssl - tar -cf - --exclude=debian . | tar -xf - -C debian/build-openssl - - for flavour in build build-openssl build-gnutls; do \ + for flavour in build build-gnutls; do \ (cd debian/$$flavour && libtoolize --copy --force && aclocal-1.7 && automake-1.7 && autoconf) \ done - cd debian/build && ./configure ${CONFIGURE_ARGS} --without-ssl - cd debian/build-openssl && ./configure ${CONFIGURE_ARGS} ${GSSAPI_ARGS} + cd debian/build && ./configure ${CONFIGURE_ARGS} ${GSSAPI_ARGS} cd debian/build-gnutls && ./configure ${CONFIGURE_ARGS} ${GSSAPI_ARGS} --without-ssl --with-gnutls touch configure-stamp @@ -65,7 +61,6 @@ build-stamp: configure-stamp dh_testdir ${MAKE} -C debian/build - ${MAKE} -C debian/build-openssl ${MAKE} -C debian/build-gnutls touch build-stamp @@ -74,7 +69,6 @@ dh_testdir ifeq (${DO_TEST},yes) -${MAKE} -C debian/build test - -${MAKE} -C debian/build-openssl test -${MAKE} -C debian/build-gnutls test endif touch test-stamp @@ -83,7 +77,7 @@ dh_testdir dh_testroot -quilt pop -a - rm -rf test-stamp build-stamp configure-stamp debian/build debian/build-openssl debian/build-gnutls debian/tmp-openssl debian/tmp-gnutls + rm -rf test-stamp build-stamp configure-stamp debian/build debian/build-gnutls debian/tmp-gnutls dh_clean debian/shlibs.local #install: DH_OPTIONS= @@ -93,13 +87,11 @@ dh_clean -k dh_installdirs ${MAKE} -C debian/build DESTDIR=$(shell pwd)/debian/tmp install - ${MAKE} -C debian/build-openssl DESTDIR=$(shell pwd)/debian/tmp-openssl install ${MAKE} -C debian/build-gnutls DESTDIR=$(shell pwd)/debian/tmp-gnutls install - dh_install -pcurl -plibcurl4-openssl -plibcurl4-openssl-dev --sourcedir=debian/tmp-openssl - dh_install -plibcurl4-gnutls -plibcurl4-gnutls-dev --sourcedir=debian/tmp-gnutls - dh_install -Ncurl -Nlibcurl4-openssl -Nlibcurl4-openssl-dev -Nlibcurl4-gnutls -Nlibcurl4-gnutls-dev --sourcedir=debian/tmp - install -m 644 debian/libcurl4-openssl.lintian-overrides debian/libcurl4-openssl/usr/share/lintian/overrides/libcurl4-openssl - install -m 644 debian/libcurl4-gnutls.lintian-overrides debian/libcurl4-gnutls/usr/share/lintian/overrides/libcurl4-gnutls + dh_install -plibcurl3-gnutls -plibcurl4-gnutls-dev --sourcedir=debian/tmp-gnutls + dh_install -Nlibcurl3-gnutls -Nlibcurl4-gnutls-dev --sourcedir=debian/tmp + install -m 644 debian/libcurl3-gnutls.lintian-overrides debian/libcurl3-gnutls/usr/share/lintian/overrides/libcurl3-gnutls + install -m 644 debian/libcurl3.lintian-overrides debian/libcurl3/usr/share/lintian/overrides/libcurl3 # Build architecture-independent files here. #binary-indep: DH_OPTIONS=-i @@ -112,7 +104,7 @@ dh_testdir dh_testroot dh_installdocs - for package in libcurl4-dev libcurl4-openssl-dev libcurl4-gnutls-dev; do \ + for package in libcurl4-openssl-dev libcurl4-gnutls-dev; do \ install -m 644 docs/libcurl/libcurl.m4 debian/$${package}/usr/share/aclocal; \ for doc_ext in html pdf; do \ install -m 644 docs/*.$${doc_ext} debian/$${package}/usr/share/doc/$${package}/$${doc_ext}; \ @@ -123,14 +115,13 @@ dh_installexamples dh_installchangelogs CHANGES dh_link - dh_strip -Nlibcurl4 -Nlibcurl4-openssl -Nlibcurl4-gnutls - dh_strip -plibcurl4 -plibcurl4-openssl -plibcurl4-gnutls --dbg-package=libcurl4-dbg + dh_strip -Nlibcurl3 -Nlibcurl3-gnutls + dh_strip -plibcurl3 -plibcurl3-gnutls --dbg-package=libcurl3-dbg dh_compress dh_fixperms - echo "libcurl 4 libcurl4-openssl (>= $(SHLIBS_VERSION))" > debian/shlibs.local - dh_makeshlibs -plibcurl4 -V "libcurl4 (>= $(SHLIBS_VERSION))" - dh_makeshlibs -plibcurl4-openssl -V "libcurl4-openssl (>= $(SHLIBS_VERSION))" - dh_makeshlibs -plibcurl4-gnutls -V "libcurl4-gnutls (>= $(SHLIBS_VERSION))" + echo "libcurl 4 libcurl3 (>= $(SHLIBS_VERSION))" > debian/shlibs.local + dh_makeshlibs -plibcurl3 -V "libcurl3 (>= $(SHLIBS_VERSION))" + dh_makeshlibs -plibcurl3-gnutls -V "libcurl3-gnutls (>= $(SHLIBS_VERSION))" dh_installdeb dh_shlibdeps dh_md5sums reverted: --- curl-7.16.2/debian/libcurl4-gnutls.lintian-overrides +++ curl-7.16.2.orig/debian/libcurl4-gnutls.lintian-overrides @@ -1 +0,0 @@ -libcurl4-gnutls: package-name-doesnt-match-sonames libcurl-gnutls4 diff -u curl-7.16.2/debian/changelog curl-7.16.2/debian/changelog --- curl-7.16.2/debian/changelog +++ curl-7.16.2/debian/changelog @@ -1,3 +1,12 @@ +curl (7.16.2-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Re-introduce curl3 symbol versions and rename the packages back to + libcurl3*, restoring ABI compatibility with the etch version of the + package. + + -- Steve Langasek <[EMAIL PROTECTED]> Tue, 12 Jun 2007 18:00:00 -0700 + curl (7.16.2-4) unstable; urgency=low * Fixed configure.ac in case of build with GNUTLS (closes: #425013). reverted: --- curl-7.16.2/debian/libcurl4-dev.links +++ curl-7.16.2.orig/debian/libcurl4-dev.links @@ -1,10 +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 reverted: --- curl-7.16.2/debian/libcurl4-dbg.dirs +++ curl-7.16.2.orig/debian/libcurl4-dbg.dirs @@ -1 +0,0 @@ -usr/lib/debug reverted: --- curl-7.16.2/debian/libcurl4-dbg.docs +++ curl-7.16.2.orig/debian/libcurl4-dbg.docs @@ -1,6 +0,0 @@ -README -docs/BUGS -docs/KNOWN_BUGS -docs/THANKS -docs/TODO -docs/VERSIONS reverted: --- curl-7.16.2/debian/libcurl4-openssl.dirs +++ curl-7.16.2.orig/debian/libcurl4-openssl.dirs @@ -1,2 +0,0 @@ -usr/lib -usr/share/lintian/overrides reverted: --- curl-7.16.2/debian/libcurl4-openssl.docs +++ curl-7.16.2.orig/debian/libcurl4-openssl.docs @@ -1,9 +0,0 @@ -README -docs/BINDINGS -docs/BUGS -docs/FAQ -docs/FEATURES -docs/KNOWN_BUGS -docs/THANKS -docs/TODO -docs/VERSIONS reverted: --- curl-7.16.2/debian/libcurl4-openssl.install +++ curl-7.16.2.orig/debian/libcurl4-openssl.install @@ -1 +0,0 @@ -usr/lib/libcurl-openssl.so.4* reverted: --- curl-7.16.2/debian/libcurl4-gnutls.dirs +++ curl-7.16.2.orig/debian/libcurl4-gnutls.dirs @@ -1,2 +0,0 @@ -usr/lib -usr/share/lintian/overrides reverted: --- curl-7.16.2/debian/libcurl4-gnutls.docs +++ curl-7.16.2.orig/debian/libcurl4-gnutls.docs @@ -1,9 +0,0 @@ -README -docs/BINDINGS -docs/BUGS -docs/FAQ -docs/FEATURES -docs/KNOWN_BUGS -docs/THANKS -docs/TODO -docs/VERSIONS reverted: --- curl-7.16.2/debian/libcurl4-dev.manpages +++ curl-7.16.2.orig/debian/libcurl4-dev.manpages @@ -1,43 +0,0 @@ -docs/curl-config.1 -docs/libcurl/curl_easy_cleanup.3 -docs/libcurl/curl_easy_duphandle.3 -docs/libcurl/curl_easy_getinfo.3 -docs/libcurl/curl_easy_init.3 -docs/libcurl/curl_easy_perform.3 -docs/libcurl/curl_easy_reset.3 -docs/libcurl/curl_easy_setopt.3 -docs/libcurl/curl_easy_strerror.3 -docs/libcurl/curl_escape.3 -docs/libcurl/curl_formadd.3 -docs/libcurl/curl_formfree.3 -docs/libcurl/curl_free.3 -docs/libcurl/curl_getdate.3 -docs/libcurl/curl_getenv.3 -docs/libcurl/curl_global_cleanup.3 -docs/libcurl/curl_global_init.3 -docs/libcurl/curl_global_init_mem.3 -docs/libcurl/curl_mprintf.3 -docs/libcurl/curl_multi_add_handle.3 -docs/libcurl/curl_multi_cleanup.3 -docs/libcurl/curl_multi_fdset.3 -docs/libcurl/curl_multi_info_read.3 -docs/libcurl/curl_multi_init.3 -docs/libcurl/curl_multi_perform.3 -docs/libcurl/curl_multi_remove_handle.3 -docs/libcurl/curl_multi_strerror.3 -docs/libcurl/curl_share_cleanup.3 -docs/libcurl/curl_share_init.3 -docs/libcurl/curl_share_setopt.3 -docs/libcurl/curl_share_strerror.3 -docs/libcurl/curl_slist_append.3 -docs/libcurl/curl_slist_free_all.3 -docs/libcurl/curl_strequal.3 -docs/libcurl/curl_unescape.3 -docs/libcurl/curl_version.3 -docs/libcurl/curl_version_info.3 -docs/libcurl/libcurl-easy.3 -docs/libcurl/libcurl-errors.3 -docs/libcurl/libcurl-multi.3 -docs/libcurl/libcurl-share.3 -docs/libcurl/libcurl-tutorial.3 -docs/libcurl/libcurl.3 reverted: --- curl-7.16.2/debian/libcurl4-gnutls.install +++ curl-7.16.2.orig/debian/libcurl4-gnutls.install @@ -1 +0,0 @@ -usr/lib/libcurl-gnutls.so.4* diff -u curl-7.16.2/debian/libcurl4-gnutls-dev.install curl-7.16.2/debian/libcurl4-gnutls-dev.install --- curl-7.16.2/debian/libcurl4-gnutls-dev.install +++ curl-7.16.2/debian/libcurl4-gnutls-dev.install @@ -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/libcurl.a +usr/lib/libcurl.la +usr/lib/libcurl.so usr/lib/pkgconfig/libcurl.pc usr/include reverted: --- curl-7.16.2/debian/libcurl4-openssl.lintian-overrides +++ curl-7.16.2.orig/debian/libcurl4-openssl.lintian-overrides @@ -1 +0,0 @@ -libcurl4-openssl: package-name-doesnt-match-sonames libcurl-openssl4 diff -u curl-7.16.2/debian/libcurl4-gnutls-dev.links curl-7.16.2/debian/libcurl4-gnutls-dev.links --- curl-7.16.2/debian/libcurl4-gnutls-dev.links +++ curl-7.16.2/debian/libcurl4-gnutls-dev.links @@ -11,3 +10,0 @@ -/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 -u curl-7.16.2/debian/patches/series curl-7.16.2/debian/patches/series --- curl-7.16.2/debian/patches/series +++ curl-7.16.2/debian/patches/series @@ -6 +5,0 @@ -openssl reverted: --- curl-7.16.2/debian/patches/openssl +++ curl-7.16.2.orig/debian/patches/openssl @@ -1,58 +0,0 @@ -Index: curl/lib/Makefile.am -=================================================================== ---- curl.orig/lib/Makefile.am 2007-04-17 16:32:31.000000000 +0200 -+++ curl/lib/Makefile.am 2007-04-17 16:32:50.000000000 +0200 -@@ -38,7 +38,7 @@ - - CLEANFILES = $(DSP) $(VCPROJ) - --lib_LTLIBRARIES = libcurl-gnutls.la -+lib_LTLIBRARIES = libcurl-openssl.la - LIBCURL_LIBS = @LIBCURL_LIBS@ - - # we use srcdir/include for the static global include files -@@ -94,12 +94,12 @@ - VERSIONED_SYMBOLS = -Wl,--version-script=libcurl.vers - endif - --libcurl_gnutls_la_LDFLAGS = $(UNDEF) $(VERSION) $(MIMPURE) $(LIBCURL_LIBS) $(VERSIONED_SYMBOLS) -+libcurl_openssl_la_LDFLAGS = $(UNDEF) $(VERSION) $(MIMPURE) $(LIBCURL_LIBS) $(VERSIONED_SYMBOLS) - - # Makefile.inc provides the CSOURCES and HHEADERS defines - include Makefile.inc - --libcurl_gnutls_la_SOURCES = $(CSOURCES) $(HHEADERS) -+libcurl_openssl_la_SOURCES = $(CSOURCES) $(HHEADERS) - - WIN32SOURCES = $(CSOURCES) - WIN32HEADERS = $(HHEADERS) config-win32.h -Index: curl/src/Makefile.am -=================================================================== ---- curl.orig/src/Makefile.am 2007-04-17 16:32:31.000000000 +0200 -+++ curl/src/Makefile.am 2007-04-17 16:32:50.000000000 +0200 -@@ -37,8 +37,8 @@ - - include Makefile.inc - --curl_LDADD = ../lib/libcurl-gnutls.la @CURL_LIBS@ --curl_DEPENDENCIES = ../lib/libcurl-gnutls.la -+curl_LDADD = ../lib/libcurl-openssl.la @CURL_LIBS@ -+curl_DEPENDENCIES = ../lib/libcurl-openssl.la - BUILT_SOURCES = hugehelp.c - CLEANFILES = hugehelp.c - [EMAIL PROTECTED]@ @MANOPT@ # figured out by the configure script -Index: curl/tests/libtest/Makefile.am -=================================================================== ---- curl.orig/tests/libtest/Makefile.am 2007-04-17 16:32:31.000000000 +0200 -+++ curl/tests/libtest/Makefile.am 2007-04-17 16:32:50.000000000 +0200 -@@ -50,8 +50,8 @@ - lib529 lib530 lib532 lib533 lib536 lib537 - - # Dependencies (may need to be overriden) --LIBTEST_LIBS = $(LIBDIR)/libcurl-gnutls.la --DEPENDENCIES = $(LIBDIR)/libcurl-gnutls.la -+LIBTEST_LIBS = $(LIBDIR)/libcurl-openssl.la -+DEPENDENCIES = $(LIBDIR)/libcurl-openssl.la - - lib500_SOURCES = lib500.c $(SUPPORTFILES) - lib500_DEPENDENCIES = $(DEPENDENCIES) diff -u curl-7.16.2/debian/patches/versioned curl-7.16.2/debian/patches/versioned --- curl-7.16.2/debian/patches/versioned +++ curl-7.16.2/debian/patches/versioned @@ -93,7 +93,7 @@ + _save*; +}; + [EMAIL PROTECTED]@4 [EMAIL PROTECTED]@3 +{ + global: curl_*; + local: *; reverted: --- curl-7.16.2/debian/libcurl4.install +++ curl-7.16.2.orig/debian/libcurl4.install @@ -1 +0,0 @@ -usr/lib/libcurl.so.4* reverted: --- curl-7.16.2/debian/libcurl4.dirs +++ curl-7.16.2.orig/debian/libcurl4.dirs @@ -1 +0,0 @@ -usr/lib reverted: --- curl-7.16.2/debian/libcurl4.docs +++ curl-7.16.2.orig/debian/libcurl4.docs @@ -1,9 +0,0 @@ -README -docs/BINDINGS -docs/BUGS -docs/FAQ -docs/FEATURES -docs/KNOWN_BUGS -docs/THANKS -docs/TODO -docs/VERSIONS reverted: --- curl-7.16.2/debian/libcurl4-dev.install +++ curl-7.16.2.orig/debian/libcurl4-dev.install @@ -1,6 +0,0 @@ -usr/bin/curl-config -usr/lib/libcurl.a -usr/lib/libcurl.la -usr/lib/libcurl.so -usr/lib/pkgconfig/libcurl.pc -usr/include reverted: --- curl-7.16.2/debian/libcurl4-dev.examples +++ curl-7.16.2.orig/debian/libcurl4-dev.examples @@ -1,35 +0,0 @@ -docs/examples/Makefile.example -docs/examples/README -docs/examples/anyauthput.c -docs/examples/cacertinmem.c -docs/examples/cookie_interface.c -docs/examples/curlgtk.c -docs/examples/curlx.c -docs/examples/debug.c -docs/examples/fileupload.c -docs/examples/fopen.c -docs/examples/ftp3rdparty.c -docs/examples/ftpget.c -docs/examples/ftpgetresp.c -docs/examples/ftpupload.c -docs/examples/getinfo.c -docs/examples/getinmemory.c -docs/examples/htmltidy.c -docs/examples/htmltitle.cc -docs/examples/http-post.c -docs/examples/httpput.c -docs/examples/https.c -docs/examples/multi-app.c -docs/examples/multi-debugcallback.c -docs/examples/multi-double.c -docs/examples/multi-post.c -docs/examples/multi-single.c -docs/examples/multithread.c -docs/examples/opensslthreadlock.c -docs/examples/persistant.c -docs/examples/post-callback.c -docs/examples/postit2.c -docs/examples/sepheaders.c -docs/examples/simple.c -docs/examples/simplepost.c -docs/examples/simplessl.c reverted: --- curl-7.16.2/debian/libcurl4-dev.doc-base +++ curl-7.16.2.orig/debian/libcurl4-dev.doc-base @@ -1,9 +0,0 @@ -Document: libcurl4-dev -Title: libcurl documentation -Author: Daniel Stenberg -Abstract: HTML version of all the manpages about libcurl -Section: Apps/devel - -Format: HTML -Index: /usr/share/doc/libcurl4-dev/html/index.html -Files: /usr/share/doc/libcurl4-dev/html/*.html reverted: --- curl-7.16.2/debian/libcurl4-dev.dirs +++ curl-7.16.2.orig/debian/libcurl4-dev.dirs @@ -1,7 +0,0 @@ -usr/lib -usr/include -usr/share/aclocal -usr/share/doc/libcurl4-dev/html -usr/share/doc/libcurl4-dev/html/libcurl -usr/share/doc/libcurl4-dev/pdf -usr/share/doc/libcurl4-dev/pdf/libcurl reverted: --- curl-7.16.2/debian/libcurl4-dev.docs +++ curl-7.16.2.orig/debian/libcurl4-dev.docs @@ -1,14 +0,0 @@ -README -docs/BINDINGS -docs/BUGS -docs/CONTRIBUTE -docs/FAQ -docs/FEATURES -docs/HISTORY -docs/INTERNALS -docs/KNOWN_BUGS -docs/RESOURCES -docs/THANKS -docs/TODO -docs/VERSIONS -docs/TheArtOfHttpScripting only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-dbg.dirs +++ curl-7.16.2/debian/libcurl3-dbg.dirs @@ -0,0 +1 @@ +usr/lib/debug only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3.links +++ curl-7.16.2/debian/libcurl3.links @@ -0,0 +1,2 @@ +libcurl.so.4 /usr/lib/libcurl.so.3 + only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-dbg.docs +++ curl-7.16.2/debian/libcurl3-dbg.docs @@ -0,0 +1,6 @@ +README +docs/BUGS +docs/KNOWN_BUGS +docs/THANKS +docs/TODO +docs/VERSIONS only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3.dirs +++ curl-7.16.2/debian/libcurl3.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/share/lintian/overrides only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-gnutls.dirs +++ curl-7.16.2/debian/libcurl3-gnutls.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/share/lintian/overrides only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3.install +++ curl-7.16.2/debian/libcurl3.install @@ -0,0 +1 @@ +usr/lib/libcurl.so.4* only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3.docs +++ curl-7.16.2/debian/libcurl3.docs @@ -0,0 +1,9 @@ +README +docs/BINDINGS +docs/BUGS +docs/FAQ +docs/FEATURES +docs/KNOWN_BUGS +docs/THANKS +docs/TODO +docs/VERSIONS only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-gnutls.links +++ curl-7.16.2/debian/libcurl3-gnutls.links @@ -0,0 +1 @@ +libcurl-gnutls.so.4 /usr/lib/libcurl-gnutls.so.3 only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-gnutls.docs +++ curl-7.16.2/debian/libcurl3-gnutls.docs @@ -0,0 +1,9 @@ +README +docs/BINDINGS +docs/BUGS +docs/FAQ +docs/FEATURES +docs/KNOWN_BUGS +docs/THANKS +docs/TODO +docs/VERSIONS only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3.lintian-overrides +++ curl-7.16.2/debian/libcurl3.lintian-overrides @@ -0,0 +1 @@ +libcurl3: package-name-doesnt-match-sonames libcurl4 only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-gnutls.install +++ curl-7.16.2/debian/libcurl3-gnutls.install @@ -0,0 +1 @@ +usr/lib/libcurl-gnutls.so.4* only in patch2: unchanged: --- curl-7.16.2.orig/debian/libcurl3-gnutls.lintian-overrides +++ curl-7.16.2/debian/libcurl3-gnutls.lintian-overrides @@ -0,0 +1 @@ +libcurl3-gnutls: package-name-doesnt-match-sonames libcurl-gnutls4
