* Merge from debian unstable (lp: #225005), 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) * Dropped Ubuntu patches, applied upstream: - 50_show_primary_only.dpatch - 60_install_options_skel.dpatch * Add 'debian/patches/55_curl_typefix.dpatch': Fix a build error with recent curl and gcc 4.3 (lp: #247679). Patch taken from upstream: http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html