* Merge from debian, remaining changes: - Provide upstart user session jobs. - Add Vcs-Bzr for Ubuntu - Add 04_nodisplay_autostart.patch to clean up the startup icons dialogue * debian/gnome-keyring.ubiquity, debian/rules: - Apply capabilities at the end of the ubiquity process to make sure new installs have gnome-keyring-daemon with cap_ipc_lock+ep. * debian/control, debian/*.install, debian/rules: - change for multiarch support, install pkcs11 in its own binary * Drop obsolete Breaks from pre-wheezy. * Disable gpg agent as it is incomplete and incompatible with many uses of GnuPG 2.x. (Closes: #760102). * Depend on pinentry-gnome3 instead to provide the system modal dialogs. (Closes: #787786) * Remove obsolete /etc/xdg/autostart/gnome-keyring-gpg.desktop on upgrades. * Upload to unstable. * New upstream release. - Contains lots of memory leaks fixes. - Fixes issues with logout from Plasma session. * Fix a typo in README.debian (closes: #755367). * Update Homepage field. * Install manpages, now that is possible again. * Bump Standards-Version to 3.9.6, no changes needed.