-
Committer:
Bazaar Package Importer
-
Author(s):
Nicolas Valcárcel Scerpella
-
Date:
2009-05-05 16:02:14 UTC
-
mfrom:
(1.1.10 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090505160214-f42nk7q3o9ji3bx9
Tags: 1.4.9-4ubuntu1
* Merge from debian unstable, remaining changes:
- Add 'debian/patches/50_disable_mlock_test.dpatch': Disable mlock() test
since it fails with ulimit 0 (on buildds).
- Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg
(or gpg2) and gpgsm to use a passphrase agent by default (lp: 15485)
- Add libcurl4-gnutls-dev to Build-Depends to fix gpg running into a
timeout updating the keyring (lp: 62864)
- Add 'debian/patches/55_curl_typefix.dpatch': Fix a build error with recent
curl and gcc 4.3