~ubuntu-branches/ubuntu/natty/curl/natty-proposed

« back to all changes in this revision

Viewing changes to include/curl/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-11-29 17:26:37 UTC
  • mfrom: (3.4.9 sid)
  • Revision ID: james.westby@ubuntu.com-20101129172637-7wwnlut14uxp2kfx
Tags: 7.21.2-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes: (LP: #682286)
* debian/control:
  - (Keep build deps in main)
  - Drop build dependencies: stunnel, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
96
96
CURL_DISABLE_DICT = @CURL_DISABLE_DICT@
97
97
CURL_DISABLE_FILE = @CURL_DISABLE_FILE@
98
98
CURL_DISABLE_FTP = @CURL_DISABLE_FTP@
 
99
CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@
99
100
CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@
100
101
CURL_DISABLE_IMAP = @CURL_DISABLE_IMAP@
101
102
CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@