* Merge from debian unstable. Remaining changes: - debian/rules: Switch back to using /usr/bin/gpg and add back gnupg build dependency, as we don't install gnupg2 by default. This was missing in the previous upload, and unbreaks nautilus-dropbox, seahorse, bzr, and other libgpgme consumers. - debian/control: Depends on "gnupg | gnupg2" rather than gnupg2, default to the old version since the new one depends on gpg-agent, pinentry-gtk2, and a bunch of other packages we don't need/want in the default installation * NMU * New upstream release. * debian/control (Build-Depends): Dropped dirmngr (closes: #712813). It is not necessary for the build. (Vcs-Browser, Vcs-Svn): Fixed vcs-field-not-canonical. * debian/libgpgme11.symbols: Updated symbols file.