-
Committer:
Bazaar Package Importer
-
Author(s):
Bhavani Shankar
-
Date:
2010-06-20 13:56:28 UTC
-
mfrom:
(3.4.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20100620135628-e30tp9jldq6hq985
Tags: 7.21.0-1ubuntu1
* Merge from debian unstable.  Remaining changes: LP: #596334
  - 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.