-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2009-12-11 19:33:21 UTC
-
mfrom:
(3.4.2 squeeze)
(40.1.2 curl)
-
Revision ID:
james.westby@ubuntu.com-20091211193321-tenukopudyznzbjj
* Merge with Debian testing.  Remaining changes:
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.