~ubuntu-branches/ubuntu/utopic/curl/utopic-updates

« back to all changes in this revision

Viewing changes to docs/FEATURES

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2011-05-02 19:12:31 UTC
  • mfrom: (3.4.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110502191231-1hiklg06nzo62ws8
Tags: 7.21.6-1ubuntu1
* Merge from debian unstable (LP: #775794), remaining changes:
  - debian/control:
    + Build-Depends: Replace libssh2-1-dev with openssh-server.
      Drop stunnel since it's in universe, as well.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
125
125
FOOTNOTES
126
126
=========
127
127
 
128
 
  *1 = requires OpenSSL, GnuTLS, NSS, yassl or PolarSSL
 
128
  *1 = requires OpenSSL, GnuTLS, NSS, yassl, axTLS or PolarSSL
129
129
  *2 = requires OpenLDAP
130
130
  *3 = requires a GSSAPI-compliant library, such as Heimdal or similar.
131
131
  *4 = requires FBopenssl